diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-14 16:49:22 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-14 16:49:22 +0000 |
| commit | d568221710959cf7d783e6ff0fb80fb43a231124 (patch) | |
| tree | 8d6f039393294c6ffac8533639afdebe5d68bfc1 /os/xdmauth.c | |
| parent | 9508a382f8a9f241dab097d921b6d290c1c3a776 (diff) | |
XFree86 4.3.0.1xf86-4_3_0_1PRE_xf86-4_3_0_1
Diffstat (limited to 'os/xdmauth.c')
| -rw-r--r-- | os/xdmauth.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/os/xdmauth.c b/os/xdmauth.c index d6abd6a14..eb1385408 100644 --- a/os/xdmauth.c +++ b/os/xdmauth.c @@ -26,6 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/programs/Xserver/os/xdmauth.c,v 1.7 2002/11/05 05:50:34 keithp Exp $ */ /* * XDM-AUTHENTICATION-1 (XDMCP authentication) and @@ -348,6 +349,7 @@ XID id; switch (data_length) { case 16: /* auth from files is 16 bytes long */ +#ifdef XDMCP if (authFromXDMCP) { /* R5 xdm sent bogus authorization data in the accept packet, @@ -357,15 +359,18 @@ XID id; key_bits[0] = '\0'; } else +#endif { rho_bits = (unsigned char *) data; key_bits = (unsigned char *) (data + 8); } break; +#ifdef XDMCP case 8: /* auth from XDMCP is 8 bytes long */ rho_bits = rho.data; key_bits = (unsigned char *) data; break; +#endif default: return 0; } @@ -415,7 +420,7 @@ XdmCheckCookie (cookie_length, cookie, xclient, reason) } int -XdmResetCookie () +XdmResetCookie (void) { XdmAuthorizationPtr auth, next_auth; XdmClientAuthPtr client, next_client; @@ -493,10 +498,12 @@ char *data; rho_bits = (XdmAuthKeyPtr) data; key_bits = (XdmAuthKeyPtr) (data + 8); break; +#ifdef XDMCP case 8: rho_bits = ρ key_bits = (XdmAuthKeyPtr) data; break; +#endif default: return 0; } |