xserver: Branch 'master'

[Eamon Walsh]

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

New commits:
diff-tree 3d39c02fe6aaa602c52f1d4f0ea6cd3bd000cf9f (from 75fe0670eb1f71144246f1c20759d58788bbee00)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Mon Nov 6 21:25:52 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.

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 2e7fa79..d8e3ae7 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3682,7 +3682,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;