From 1526f1caf396fefc5f09eaff884d5b92aac44997 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 31 May 2011 19:54:33 -0700 Subject: [PATCH] Remove unused ClientStateAuthenticating Appears to be leftover from the Kerberos code deleted in 2007 (commit dfbe32b5b828cc4e3da36a0e2e6ad641164eaa5e). Nothing left ever set clientState to ClientStateAuthenticating Skipped over 1 to preserve existing enum numbering. Signed-off-by: Alan Coopersmith Reviewed-by: Julien Cristau --- dix/dispatch.c | 16 +++------------- include/dixstruct.h | 4 ++-- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dix/dispatch.c b/dix/dispatch.c index e21f08ffe..6c44c5e04 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -3443,8 +3443,7 @@ CloseDownClient(ClientPtr client) * now. If it hasn't gotten to Running, nClients has *not* * been incremented, so *don't* decrement it. */ - if (client->clientState != ClientStateInitial && - client->clientState != ClientStateAuthenticating ) + if (client->clientState != ClientStateInitial) { --nClients; } @@ -3706,17 +3705,8 @@ ProcEstablishConnection(ClientPtr client) auth_proto, (unsigned short)prefix->nbytesAuthString, auth_string); - /* - * If Kerberos is being used for this client, the clientState - * 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; + + return(SendConnSetup(client, reason)); } void diff --git a/include/dixstruct.h b/include/dixstruct.h index 90e617b66..6cc961478 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -57,8 +57,8 @@ extern _X_EXPORT void ReplyNotSwappd ( void * /* pbuf */) _X_NORETURN; typedef enum {ClientStateInitial, - ClientStateAuthenticating, - ClientStateRunning, + /* 1 is unused now, was ClientStateAuthenticating */ + ClientStateRunning = 2, ClientStateRetained, ClientStateGone } ClientState;