 @@ -42,55 +42,54 @@ from The Open Group.
 # include   "dixstruct.h"
 # include   <sys/types.h>
 # include   <sys/stat.h>
 #ifdef WIN32
 #include    <X11/Xw32defs.h>
 #endif
 struct protocol {
     unsigned short   name_length;
     char    *name;
     AuthAddCFunc	Add;	/* new authorization data */
     AuthCheckFunc	Check;	/* verify client authorization data */
     AuthRstCFunc	Reset;	/* delete all authorization data entries */
     AuthToIDFunc	ToID;	/* convert cookie to ID */
     AuthFromIDFunc	FromID;	/* convert ID to cookie */
     AuthRemCFunc	Remove;	/* remove a specific cookie */
 #ifdef XCSECURITY
     AuthGenCFunc	Generate;
 #endif
 };
 static struct protocol   protocols[] = {
 {   (unsigned short) 18,    "MIT-MAGIC-COOKIE-1",
 		MitAddCookie,	MitCheckCookie,	MitResetCookie,
-		MitToID,	MitFromID,	MitRemoveCookie,
+		MitFromID,	MitRemoveCookie,
 #ifdef XCSECURITY
 		MitGenerateCookie
 #endif
 },
 #ifdef HASXDMAUTH
 {   (unsigned short) 19,    "XDM-AUTHORIZATION-1",
 		XdmAddCookie,	XdmCheckCookie,	XdmResetCookie,
-		XdmToID,	XdmFromID,	XdmRemoveCookie,
+		XdmFromID,	XdmRemoveCookie,
 #ifdef XCSECURITY
 		NULL
 #endif
 },
 #endif
 #ifdef SECURE_RPC
 {   (unsigned short) 9,    "SUN-DES-1",
 		SecureRPCAdd,	SecureRPCCheck,	SecureRPCReset,
-		SecureRPCToID,	SecureRPCFromID,SecureRPCRemove,
+		SecureRPCFromID,SecureRPCRemove,
 #ifdef XCSECURITY
 		NULL
 #endif
 },
 #endif
 };
 # define NUM_AUTHORIZATION  (sizeof (protocols) /\
 			     sizeof (struct protocol))
 /*
  * Initialize all classes of authorization by reading the
  * specified authorization file

 @@ -93,41 +93,26 @@ int
 MitResetCookie (void)
+{
     struct auth	*auth, *next;
     for (auth = mit_auth; auth; auth=next) {
 	next = auth->next;
 	free(auth->data);
 	free(auth);
+    }
     mit_auth = 0;
     return 0;
+}
 XID
 MitToID (
 	unsigned short	data_length,
 	char		*data)
     struct auth	*auth;
     for (auth = mit_auth; auth; auth=auth->next) {
 	if (data_length == auth->len &&
 	    memcmp (data, auth->data, data_length) == 0)
 	    return auth->id;
     return (XID) -1;
 int
 MitFromID (
 	XID		id,
 	unsigned short	*data_lenp,
 	char		**datap)
+{
     struct auth	*auth;
     for (auth = mit_auth; auth; auth=auth->next) {
 	if (id == auth->id) {
 	    *data_lenp = auth->len;
 	    *datap = auth->data;
 	    return 1;

 @@ -148,29 +148,26 @@ typedef XID (*AuthCheckFunc) (AuthCheckA
 #define AuthFromIDArgs XID id, unsigned short *data_lenp, char **datap
 typedef int (*AuthFromIDFunc) (AuthFromIDArgs);
 #define AuthGenCArgs unsigned data_length, const char *data, XID id, unsigned *data_length_return, char **data_return
 typedef XID (*AuthGenCFunc) (AuthGenCArgs);
 #define AuthRemCArgs unsigned short data_length, const char *data
 typedef int (*AuthRemCFunc) (AuthRemCArgs);
 #define AuthRstCArgs void
 typedef int (*AuthRstCFunc) (AuthRstCArgs);
 #define AuthToIDArgs unsigned short data_length, char *data
 typedef XID (*AuthToIDFunc) (AuthToIDArgs);
 typedef void (*OsCloseFunc)(ClientPtr);
 typedef int (*OsFlushFunc)(ClientPtr who, struct _osComm * oc, char* extraBuf, int extraCount);
 typedef struct _osComm {
     int fd;
     ConnectionInputPtr input;
     ConnectionOutputPtr output;
     XID	auth_id;		/* authorization id */
     CARD32 conn_time;		/* timestamp if not established, else 0  */
     struct _XtransConnInfo *trans_conn; /* transport connection object */
     Bool local_client;
 } OsCommRec, *OsCommPtr;
 @@ -217,47 +214,44 @@ typedef long int fd_mask;
 #endif
 #define ffs mffs
 extern int mffs(fd_mask);
 /* in access.c */
 extern Bool ComputeLocalClient(ClientPtr client);
 /* in auth.c */
 extern void GenerateRandomData (int len, char *buf);
 /* in mitauth.c */
 extern XID  MitCheckCookie    (AuthCheckArgs);
 extern XID  MitGenerateCookie (AuthGenCArgs);
 extern XID  MitToID           (AuthToIDArgs);
 extern int  MitAddCookie      (AuthAddCArgs);
 extern int  MitFromID         (AuthFromIDArgs);
 extern int  MitRemoveCookie   (AuthRemCArgs);
 extern int  MitResetCookie    (AuthRstCArgs);
 /* in xdmauth.c */
 #ifdef HASXDMAUTH
 extern XID  XdmCheckCookie    (AuthCheckArgs);
 extern XID  XdmToID           (AuthToIDArgs);
 extern int  XdmAddCookie      (AuthAddCArgs);
 extern int  XdmFromID         (AuthFromIDArgs);
 extern int  XdmRemoveCookie   (AuthRemCArgs);
 extern int  XdmResetCookie    (AuthRstCArgs);
 #endif
 /* in rpcauth.c */
 #ifdef SECURE_RPC
 extern void SecureRPCInit     (AuthInitArgs);
 extern XID  SecureRPCCheck    (AuthCheckArgs);
 extern XID  SecureRPCToID     (AuthToIDArgs);
 extern int  SecureRPCAdd      (AuthAddCArgs);
 extern int  SecureRPCFromID   (AuthFromIDArgs);
 extern int  SecureRPCRemove   (AuthRemCArgs);
 extern int  SecureRPCReset    (AuthRstCArgs);
 #endif
 #ifdef XDMCP
 /* in xdmcp.c */
 extern void XdmcpUseMsg (void);
 extern int XdmcpOptions(int argc, char **argv, int i);
 extern void XdmcpRegisterConnection (
     int	    type,
     const char    *address,

	@@ -167,31 +167,25 @@ SecureRPCAdd (unsigned short data_length		@@ -167,31 +167,25 @@ SecureRPCAdd (unsigned short data_length
167	if (data_length)	167	if (data_length)
168	AddHost ((pointer) 0, FamilyNetname, data_length, data);	168	AddHost ((pointer) 0, FamilyNetname, data_length, data);
169	rpc_id = id;	169	rpc_id = id;
170	return 1;	170	return 1;
171	}	171	}
172		172
173	_X_HIDDEN int	173	_X_HIDDEN int
174	SecureRPCReset (void)	174	SecureRPCReset (void)
175	{	175	{
176	rpc_id = (XID) ~0L;	176	rpc_id = (XID) ~0L;
177	return 1;	177	return 1;
178	}	178	}
179		179
180	_X_HIDDEN XID
181	SecureRPCToID (unsigned short data_length, char *data)
182	{
183	return rpc_id;
184	}
185
186	_X_HIDDEN int	180	_X_HIDDEN int
187	SecureRPCFromID (XID id, unsigned short data_lenp, char *datap)	181	SecureRPCFromID (XID id, unsigned short data_lenp, char *datap)
188	{	182	{
189	return 0;	183	return 0;
190	}	184	}
191		185
192	_X_HIDDEN int	186	_X_HIDDEN int
193	SecureRPCRemove (unsigned short data_length, const char *data)	187	SecureRPCRemove (unsigned short data_length, const char *data)
194	{	188	{
195	return 0;	189	return 0;
196	}	190	}
197	#endif /* SECURE_RPC */	191	#endif /* SECURE_RPC */

 @@ -413,51 +413,26 @@ XdmResetCookie (void)
 	next_auth = auth->next;
 	free(auth);
+    }
     xdmAuth = 0;
     for (client = xdmClients; client; client=next_client)
+    {
 	next_client = client->next;
 	free(client);
+    }
     xdmClients = (XdmClientAuthPtr) 0;
     return 1;
+}
 XID
 XdmToID (unsigned short cookie_length, char *cookie)
     XdmAuthorizationPtr	auth;
     XdmClientAuthPtr	client;
     unsigned char	*plain;
     plain = malloc(cookie_length);
     if (!plain)
 	return (XID) -1;
     for (auth = xdmAuth; auth; auth=auth->next) {
 	XdmcpUnwrap ((unsigned char *)cookie, (unsigned char *)&auth->key, plain, cookie_length);
 	if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, NULL, NULL)) != NULL)
 	    free(client);
 	    free(cookie);
 	    free(plain);
 	    return auth->id;
     free(cookie);
     free(plain);
     return (XID) -1;
 int
 XdmFromID (XID id, unsigned short *data_lenp, char **datap)
+{
     XdmAuthorizationPtr	auth;
     for (auth = xdmAuth; auth; auth=auth->next) {
 	if (id == auth->id) {
 	    *data_lenp = 16;
 	    *datap = (char *) &auth->rho;
 	    return 1;
+	}
+    }
     return 0;