hack: xdmcp
This commit is contained in:
parent
059959181a
commit
c201a9d71e
|
@ -294,9 +294,7 @@ CreateWellKnownSockets(void)
|
||||||
|
|
||||||
InitParentProcess();
|
InitParentProcess();
|
||||||
|
|
||||||
#ifdef XDMCP
|
|
||||||
XdmcpInit();
|
XdmcpInit();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -342,9 +340,7 @@ ResetWellKnownSockets(void)
|
||||||
/*
|
/*
|
||||||
* restart XDMCP
|
* restart XDMCP
|
||||||
*/
|
*/
|
||||||
#ifdef XDMCP
|
|
||||||
XdmcpReset();
|
XdmcpReset();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -336,9 +336,7 @@ UseMsg(void)
|
||||||
ErrorF("+extension name Enable extension\n");
|
ErrorF("+extension name Enable extension\n");
|
||||||
ErrorF("-extension name Disable extension\n");
|
ErrorF("-extension name Disable extension\n");
|
||||||
ListStaticExtensions();
|
ListStaticExtensions();
|
||||||
#ifdef XDMCP
|
|
||||||
XdmcpUseMsg();
|
XdmcpUseMsg();
|
||||||
#endif
|
|
||||||
XkbUseMsg();
|
XkbUseMsg();
|
||||||
ddxUseMsg();
|
ddxUseMsg();
|
||||||
}
|
}
|
||||||
|
@ -749,11 +747,9 @@ ProcessCommandLine(int argc, char *argv[])
|
||||||
else if (strncmp(argv[i], "tty", 3) == 0) {
|
else if (strncmp(argv[i], "tty", 3) == 0) {
|
||||||
/* init supplies us with this useless information */
|
/* init supplies us with this useless information */
|
||||||
}
|
}
|
||||||
#ifdef XDMCP
|
|
||||||
else if ((skip = XdmcpOptions(argc, argv, i)) != i) {
|
else if ((skip = XdmcpOptions(argc, argv, i)) != i) {
|
||||||
i = skip - 1;
|
i = skip - 1;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
else if (strcmp(argv[i], "-dumbSched") == 0) {
|
else if (strcmp(argv[i], "-dumbSched") == 0) {
|
||||||
InputThreadEnable = FALSE;
|
InputThreadEnable = FALSE;
|
||||||
#ifdef HAVE_SETITIMER
|
#ifdef HAVE_SETITIMER
|
||||||
|
|
14
os/xdmcp.h
14
os/xdmcp.h
|
@ -7,6 +7,19 @@
|
||||||
/* in xdmcp.c */
|
/* in xdmcp.c */
|
||||||
void XdmcpUseMsg(void);
|
void XdmcpUseMsg(void);
|
||||||
int XdmcpOptions(int argc, char **argv, int i);
|
int XdmcpOptions(int argc, char **argv, int i);
|
||||||
|
void XdmcpInit(void);
|
||||||
|
void XdmcpReset(void);
|
||||||
|
#else
|
||||||
|
static inline void XdmcpUseMsg(void) {}
|
||||||
|
static inline XdmcpOptions(int argc, char **argv, int i) { return i; }
|
||||||
|
static inline void XdmcpInit(void) {}
|
||||||
|
static inline XdmcpReset(void) {}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* in xdmcp.c */
|
||||||
|
#ifdef XDMCP
|
||||||
|
void XdmcpUseMsg(void);
|
||||||
|
int XdmcpOptions(int argc, char **argv, int i);
|
||||||
void XdmcpRegisterConnection(int type, const char *address, int addrlen);
|
void XdmcpRegisterConnection(int type, const char *address, int addrlen);
|
||||||
void XdmcpRegisterAuthorizations(void);
|
void XdmcpRegisterAuthorizations(void);
|
||||||
void XdmcpRegisterAuthorization(const char *name, int namelen);
|
void XdmcpRegisterAuthorization(const char *name, int namelen);
|
||||||
|
@ -21,7 +34,6 @@ void XdmcpRegisterAuthentication(const char *name,
|
||||||
ValidatorFunc Validator,
|
ValidatorFunc Validator,
|
||||||
GeneratorFunc Generator,
|
GeneratorFunc Generator,
|
||||||
AddAuthorFunc AddAuth);
|
AddAuthorFunc AddAuth);
|
||||||
|
|
||||||
struct sockaddr_in;
|
struct sockaddr_in;
|
||||||
void XdmcpRegisterBroadcastAddress(const struct sockaddr_in *addr);
|
void XdmcpRegisterBroadcastAddress(const struct sockaddr_in *addr);
|
||||||
#endif /* XDMCP */
|
#endif /* XDMCP */
|
||||||
|
|
Loading…
Reference in New Issue