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 3d39c02fe6 commit)
This commit is contained in:
Eamon Walsh 2006-11-06 21:31:21 -05:00 committed by Eamon Walsh
parent 3e39bae79f
commit e6778fee47
2 changed files with 2 additions and 5 deletions

View file

@ -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:

View file

@ -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;