Merge branch 'master' into XACE-SELINUX

Conflicts:

	dix/dixutils.c
This commit is contained in:
Eamon Walsh 2007-06-11 15:29:11 -04:00 • committed by Eamon Walsh
commit e2a720c9a1
72 changed files with 1893 additions and 6318 deletions

View file

@ -271,7 +271,7 @@ dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client, Mask access)
int clientIndex = CLIENT_ID(rid);
client->errorValue = rid;
dixLookupResource(&pRes, rid, RC_ANY, client, DixReadAccess);
dixLookupResource(&pRes, rid, RC_ANY, client, access);
if (clientIndex && pRes && clients[clientIndex] && !(rid & SERVER_BIT)) {
*pClient = clients[clientIndex];