From e6778fee47aa24c8eb9b3305515acdc7dcdd8971 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 6 Nov 2006 21:31:21 -0500
Subject: [PATCH] More work on Bug #8875: revert previous fix and try using
 client argument instead of serverClient.  Also don't use totalClientSize as
 it is not initialized until after the first call to InitClient (cherry picked
 from 3d39c02fe6aaa602c52f1d4f0ea6cd3bd000cf9f commit)

---
 Xext/security.c | 6 ++----
 dix/dispatch.c  | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index c5181edf5..ac762794a 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1122,10 +1122,8 @@ CALLBACK(SecurityClientStateCallback)
     switch (client->clientState)
     {
     case ClientStateInitial:
-	if (client == serverClient) {
-	    TRUSTLEVEL(serverClient) = XSecurityClientTrusted;
-	    AUTHID(serverClient) = None;
-	}
+	TRUSTLEVEL(client) = XSecurityClientTrusted;
+	AUTHID(client) = None;
 	break;
 
     case ClientStateRunning:
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 7c4d539fa..4d3aa27f1 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3618,7 +3618,6 @@ extern unsigned totalClientSize;
 
 void InitClient(ClientPtr client, int i, pointer ospriv)
 {
-    bzero(client, totalClientSize);
     client->index = i;
     client->sequence = 0; 
     client->clientAsMask = ((Mask)i) << CLIENTOFFSET;