xserver: Branch 'server-1.2-branch'

[Eamon Walsh]

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

New commits:
diff-tree e6778fee47aa24c8eb9b3305515acdc7dcdd8971 (from 3e39bae79f9dfd278bda1b71b33c665fc9325efc)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Mon Nov 6 21:31:21 2006 -0500

    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)

diff --git a/Xext/security.c b/Xext/security.c
index c5181ed..ac76279 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 7c4d539..4d3aa27 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;