mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-30 21:53:25 +00:00
Merge branch 'master' into XACE-SELINUX
Conflicts: dix/dixutils.c
This commit is contained in:
commit
e2a720c9a1
72 changed files with 1893 additions and 6318 deletions
|
|
@ -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];
|
||||
|
|
|
|||
Loading…
Reference in a new issue