SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More work on Bug #8875: revert previous fix and try using client argument

Browse Source 
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:
Eamon Walsh
2006-11-06 21:25:52 -05:00
committed by Eamon Walsh
parent 75fe0670eb
commit 3d39c02fe6
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Xext/security.c
View File

@@ -1122,10 +1122,8 @@ CALLBACK(SecurityClientStateCallback)
switch (client->clientState) switch (client->clientState)
{ {
case ClientStateInitial: case ClientStateInitial:
if (client == serverClient) { TRUSTLEVEL(client) = XSecurityClientTrusted;
TRUSTLEVEL(serverClient) = XSecurityClientTrusted; AUTHID(client) = None;
AUTHID(serverClient) = None;
}
break; break;
case ClientStateRunning: case ClientStateRunning:

1
dix/dispatch.c
View File

@@ -3682,7 +3682,6 @@ extern unsigned totalClientSize;
void InitClient(ClientPtr client, int i, pointer ospriv) void InitClient(ClientPtr client, int i, pointer ospriv)
{ {
bzero(client, totalClientSize);
client->index = i; client->index = i;
client->sequence = 0; client->sequence = 0;
client->clientAsMask = ((Mask)i) << CLIENTOFFSET; client->clientAsMask = ((Mask)i) << CLIENTOFFSET;