diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-15 09:59:00 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-01 15:19:16 +0100 |
| commit | 52c3c80d75081b91ff27cb8ab37ca943980d424d (patch) | |
| tree | a1b56d8797c7c43f5b3b7ea59c93570c09df497b /nx-X11/programs/Xserver/Xext/security.c | |
| parent | efc0dae0519aa0ef1fabea6a64919475fd916347 (diff) | |
| download | nx-libs-52c3c80d75081b91ff27cb8ab37ca943980d424d.tar.gz nx-libs-52c3c80d75081b91ff27cb8ab37ca943980d424d.tar.bz2 nx-libs-52c3c80d75081b91ff27cb8ab37ca943980d424d.zip | |
Naming change: Security*Access -> Dix*Access
Backported from X.org:
commit 6c46645cfc1afda8aeabfe0ed4d9342673b702f1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 14:45:42 2006 -0500
Naming change: Security*Access -> Dix*Access
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/security.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/security.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c index 3a638460e..55a805aea 100644 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c @@ -750,7 +750,7 @@ ProcSecurityRevokeAuthorization( REQUEST_SIZE_MATCH(xSecurityRevokeAuthorizationReq); pAuth = (SecurityAuthorizationPtr)SecurityLookupIDByType(client, - stuff->authId, SecurityAuthorizationResType, SecurityDestroyAccess); + stuff->authId, SecurityAuthorizationResType, DixDestroyAccess); if (!pAuth) return SecurityErrorBase + XSecurityBadAuthorization; @@ -1115,7 +1115,7 @@ SecurityCheckResourceIDAccess( int cid = CLIENT_ID(id); int reqtype = ((xReq *)client->requestBuffer)->reqType; - if (SecurityUnknownAccess == access_mode) + if (DixUnknownAccess == access_mode) return rval; /* for compatibility, we have to allow access */ switch (reqtype) @@ -2051,11 +2051,11 @@ SecurityCheckPropertyAccess(client, pWin, propertyName, access_mode) * executed a continue, which will skip the follwing code. */ action = SecurityAllowOperation; - if (access_mode & SecurityReadAccess) + if (access_mode & DixReadAccess) action = max(action, pacl->readAction); - if (access_mode & SecurityWriteAccess) + if (access_mode & DixWriteAccess) action = max(action, pacl->writeAction); - if (access_mode & SecurityDestroyAccess) + if (access_mode & DixDestroyAccess) action = max(action, pacl->destroyAction); break; } /* end for each pacl */ |