frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused ClientStateCheckingSecurity & ClientStateCheckedSecurity 

Appear to be leftovers from the XC-QUERY-SECURITY code deleted in 2007
(commit 375864cb74).
Nothing left ever set clientState to ClientStateCheckingSecurity.

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:42:48 -07:00
parent 78f946c297
commit 13ac1ba480
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/dispatch.c
View File

@ -3714,9 +3714,7 @@ ProcEstablishConnection(ClientPtr client)
* So we don't want to send the connection setup info yet, since * So we don't want to send the connection setup info yet, since
* the auth step isn't really done. * the auth step isn't really done.
*/ */
if (client->clientState == ClientStateCheckingSecurity) if (client->clientState != ClientStateAuthenticating)
client->clientState = ClientStateCheckedSecurity;
else if (client->clientState != ClientStateAuthenticating)
return(SendConnSetup(client, reason)); return(SendConnSetup(client, reason));
return Success; return Success;
} }

5
include/dixstruct.h
View File

@ -60,9 +60,8 @@ typedef enum {ClientStateInitial,
ClientStateAuthenticating, ClientStateAuthenticating,
ClientStateRunning, ClientStateRunning,
ClientStateRetained, ClientStateRetained,
ClientStateGone, ClientStateGone
ClientStateCheckingSecurity, } ClientState;
ClientStateCheckedSecurity} ClientState;
#ifdef XFIXES #ifdef XFIXES
typedef struct _saveSet { typedef struct _saveSet {