diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-06-11 15:29:11 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-06-11 15:29:11 -0400 |
| commit | e2a720c9a17dc860ee0a858c2b21fd71e86cdcd0 (patch) | |
| tree | 980937a838242092b0ec6b9cfc89b39af99d045b /dix/dixutils.c | |
| parent | 878cac71aa0018deee861b297638c0744dba631b (diff) | |
| parent | 3f9adb18f127318d054f30a57e3a77176e14c692 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/dixutils.c
Diffstat (limited to 'dix/dixutils.c')
| -rw-r--r-- | dix/dixutils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/dixutils.c b/dix/dixutils.c index 4d082cd58..14ef7e674 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -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]; |