diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-02-20 10:33:52 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-20 10:33:52 +0100 |
| commit | 3c322ffbb911b70415c47cb8ba1c3559241819f6 (patch) | |
| tree | e6e1f345f4f8fd25f67b58a1abf80d14381489ce /nx-X11/programs/Xserver/Xext/security.c | |
| parent | c79f2d289004d419d8bb76cf8bf731980d40da5d (diff) | |
| parent | 104a3e9e2dbafd31e7b1def3686d052a356fc74a (diff) | |
| download | nx-libs-3c322ffbb911b70415c47cb8ba1c3559241819f6.tar.gz nx-libs-3c322ffbb911b70415c47cb8ba1c3559241819f6.tar.bz2 nx-libs-3c322ffbb911b70415c47cb8ba1c3559241819f6.zip | |
Merge branch 'sunweaver-pr/security-acl-naming-change' into 3.6.x
Attributes GH PR #329: https://github.com/ArcticaProject/nx-libs/pull/329
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 */ |