Remove unused ClientStateAuthenticating

Appears to be leftover from the Kerberos code deleted in 2007
(commit dfbe32b5b8).
Nothing left ever set clientState to ClientStateAuthenticating

Skipped over 1 to preserve existing enum numbering.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
Alan Coopersmith 2011-05-31 19:54:33 -07:00
parent 13ac1ba480
commit 1526f1caf3
2 changed files with 5 additions and 15 deletions

View File

@ -3443,8 +3443,7 @@ CloseDownClient(ClientPtr client)
* now. If it hasn't gotten to Running, nClients has *not* * now. If it hasn't gotten to Running, nClients has *not*
* been incremented, so *don't* decrement it. * been incremented, so *don't* decrement it.
*/ */
if (client->clientState != ClientStateInitial && if (client->clientState != ClientStateInitial)
client->clientState != ClientStateAuthenticating )
{ {
--nClients; --nClients;
} }
@ -3706,17 +3705,8 @@ ProcEstablishConnection(ClientPtr client)
auth_proto, auth_proto,
(unsigned short)prefix->nbytesAuthString, (unsigned short)prefix->nbytesAuthString,
auth_string); auth_string);
/*
* If Kerberos is being used for this client, the clientState return(SendConnSetup(client, reason));
* will be set to ClientStateAuthenticating at this point.
* More messages need to be exchanged among the X server, Kerberos
* server, and client to figure out if everyone is authorized.
* So we don't want to send the connection setup info yet, since
* the auth step isn't really done.
*/
if (client->clientState != ClientStateAuthenticating)
return(SendConnSetup(client, reason));
return Success;
} }
void void

View File

@ -57,8 +57,8 @@ extern _X_EXPORT void ReplyNotSwappd (
void * /* pbuf */) _X_NORETURN; void * /* pbuf */) _X_NORETURN;
typedef enum {ClientStateInitial, typedef enum {ClientStateInitial,
ClientStateAuthenticating, /* 1 is unused now, was ClientStateAuthenticating */
ClientStateRunning, ClientStateRunning = 2,
ClientStateRetained, ClientStateRetained,
ClientStateGone ClientStateGone
} ClientState; } ClientState;