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.
This commit is contained in:
parent
75fe0670eb
commit
3d39c02fe6
|
@ -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:
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user