[PATCH 1/2] Remove unused ClientStateCheckingSecurity & ClientStateCheckedSecurity
Alan Coopersmith
alan.coopersmith at oracle.com
Fri Aug 26 19:25:01 PDT 2011
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 <alan.coopersmith at oracle.com>
---
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 192c8c3..e21f08f 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 443e8b0..90e617b 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 {
--
1.7.3.2
More information about the xorg-devel
mailing list