From 13ac1ba480ee3e89163825cd2777f9a6e9dcbc9f Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 31 May 2011 19:42:48 -0700 Subject: [PATCH] Remove unused ClientStateCheckingSecurity & ClientStateCheckedSecurity Appear to be leftovers from the XC-QUERY-SECURITY code deleted in 2007 (commit 375864cb74cced40ae688078b1f7750998972535). Nothing left ever set clientState to ClientStateCheckingSecurity. Signed-off-by: Alan Coopersmith Reviewed-by: Julien Cristau --- dix/dispatch.c | 4 +--- include/dixstruct.h | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dix/dispatch.c b/dix/dispatch.c index 192c8c34e..e21f08ffe 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -3714,9 +3714,7 @@ ProcEstablishConnection(ClientPtr client) * So we don't want to send the connection setup info yet, since * the auth step isn't really done. */ - if (client->clientState == ClientStateCheckingSecurity) - client->clientState = ClientStateCheckedSecurity; - else if (client->clientState != ClientStateAuthenticating) + if (client->clientState != ClientStateAuthenticating) return(SendConnSetup(client, reason)); return Success; } diff --git a/include/dixstruct.h b/include/dixstruct.h index 443e8b0ae..90e617b66 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -60,9 +60,8 @@ typedef enum {ClientStateInitial, ClientStateAuthenticating, ClientStateRunning, ClientStateRetained, - ClientStateGone, - ClientStateCheckingSecurity, - ClientStateCheckedSecurity} ClientState; + ClientStateGone +} ClientState; #ifdef XFIXES typedef struct _saveSet {