diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-11-06 14:00:38 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-11-06 14:00:38 +0000 |
| commit | 7dea0339c8a3e1ac976bee1175ed2b2e315c2785 (patch) | |
| tree | c84a5b9a7f55a1fbb8d46a06b14bf920ce31e0ac /app/xenodm | |
| parent | c179e14bd01a3153f4145524474ce80a4d829871 (diff) | |
More unused code, when xdm-authorization is not used.
Diffstat (limited to 'app/xenodm')
| -rw-r--r-- | app/xenodm/include/dm.h | 38 | ||||
| -rw-r--r-- | app/xenodm/xenodm/auth.c | 6 |
2 files changed, 6 insertions, 38 deletions
diff --git a/app/xenodm/include/dm.h b/app/xenodm/include/dm.h index 60a6e15e4..dd7721ca2 100644 --- a/app/xenodm/include/dm.h +++ b/app/xenodm/include/dm.h @@ -52,17 +52,12 @@ from The Open Group. # include <limits.h> # include <time.h> # define Time_t time_t +# include <stdlib.h> -# include <X11/Xdmcp.h> +# include <X11/Xdmcp.h> -# ifdef _POSIX_SOURCE -# include <sys/wait.h> -# else -# define _POSIX_SOURCE -# include <sys/wait.h> -# undef _POSIX_SOURCE -# endif +# include <sys/wait.h> # define waitCode(w) (WIFEXITED(w) ? WEXITSTATUS(w) : 0) # define waitSig(w) (WIFSIGNALED(w) ? WTERMSIG(w) : 0) # define waitCore(w) 0 /* not in POSIX. so what? */ @@ -149,21 +144,6 @@ struct display { # define PROTO_TIMEOUT (30 * 60) /* 30 minutes should be long enough */ # define XDM_BROKEN_INTERVAL (120) /* server crashing more than once within */ /* two minutes is assumed to be broken! */ -struct protoDisplay { - struct protoDisplay *next; - XdmcpNetaddr address; /* UDP address */ - int addrlen; /* UDP address length */ - unsigned long date; /* creation date */ - CARD16 displayNumber; - CARD16 connectionType; - ARRAY8 connectionAddress; - CARD32 sessionID; - Xauth *fileAuthorization; - Xauth *xdmcpAuthorization; - ARRAY8 authenticationName; - ARRAY8 authenticationData; - XdmAuthKeyRec key; -}; struct greet_info { char *name; /* user name */ @@ -193,13 +173,7 @@ struct verify_info { # define RESERVER_DISPLAY 3 /* force server termination */ # define OPENFAILED_DISPLAY 4 /* XOpenDisplay failed, retry */ -# ifndef TRUE -# define TRUE 1 -# define FALSE 0 -# endif - extern char *config; - extern char *servers; extern int request_port; extern int debugLevel; @@ -293,9 +267,7 @@ extern void WaitForChild (void); * CloseOnFork flags */ -#define CLOSE_ALWAYS 0 -#define LEAVE_FOR_DISPLAY 1 - -#include <stdlib.h> +# define CLOSE_ALWAYS 0 +# define LEAVE_FOR_DISPLAY 1 #endif /* _DM_H_ */ diff --git a/app/xenodm/xenodm/auth.c b/app/xenodm/xenodm/auth.c index 5a5dee540..f879205fe 100644 --- a/app/xenodm/xenodm/auth.c +++ b/app/xenodm/xenodm/auth.c @@ -61,16 +61,12 @@ struct AuthProtocol { const char *name; void (*InitAuth)(unsigned short len, char *name); Xauth *(*GetAuth)(unsigned short len, char *name); - void (*GetXdmcpAuth)( - struct protoDisplay *pdpy, - unsigned short authorizationNameLen, - char *authorizationName); int inited; }; static struct AuthProtocol AuthProtocols[] = { { (unsigned short) 18, "MIT-MAGIC-COOKIE-1", - MitInitAuth, MitGetAuth, NULL + MitInitAuth, MitGetAuth, }, }; |