diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-03-28 01:21:00 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-03-28 01:21:00 +0000 |
| commit | 7deaaa797cf8e7ca71e9b34fa6f413d1ed2b3dab (patch) | |
| tree | 68207e778570383e7f4ace7d1ff8cea27bb67ce1 /os | |
| parent | 7342dbe4b2108827eaf30993ceeecbd828da2290 (diff) | |
Big old pile of warning fixes.
Diffstat (limited to 'os')
| -rw-r--r-- | os/connection.c | 2 | ||||
| -rw-r--r-- | os/xdmauth.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/os/connection.c b/os/connection.c index 5b1932840..8a7eb872a 100644 --- a/os/connection.c +++ b/os/connection.c @@ -654,8 +654,10 @@ ClientAuthorized(ClientPtr client, XID auth_id; char *reason = NULL; XtransConnInfo trans_conn; +#ifdef LBX int restore_trans_conn = 0; ClientPtr lbxpc = NULL; +#endif priv = (OsCommPtr)client->osPrivate; trans_conn = priv->trans_conn; diff --git a/os/xdmauth.c b/os/xdmauth.c index e02ca349c..f88d25a27 100644 --- a/os/xdmauth.c +++ b/os/xdmauth.c @@ -70,9 +70,7 @@ XdmAuthenticationValidator (ARRAY8Ptr privateData, ARRAY8Ptr incomingData, XdmcpUnwrap (incomingData->data, &privateKey, incomingData->data,incomingData->length); - switch (packet_type) - { - case ACCEPT: + if (packet_type == ACCEPT) { if (incomingData->length != 8) return FALSE; incoming = (XdmAuthKeyPtr) incomingData->data; @@ -88,9 +86,7 @@ XdmAuthenticationGenerator (ARRAY8Ptr privateData, ARRAY8Ptr outgoingData, { outgoingData->length = 0; outgoingData->data = 0; - switch (packet_type) - { - case REQUEST: + if (packet_type == REQUEST) { if (XdmcpAllocARRAY8 (outgoingData, 8)) XdmcpWrap (&rho, &privateKey, outgoingData->data, 8); } |