aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/include
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-15 09:59:00 +0100
committerMihai Moldovan <ionic@ionic.de>2017-03-01 15:19:16 +0100
commit52c3c80d75081b91ff27cb8ab37ca943980d424d (patch)
treea1b56d8797c7c43f5b3b7ea59c93570c09df497b /nx-X11/programs/Xserver/include
parentefc0dae0519aa0ef1fabea6a64919475fd916347 (diff)
downloadnx-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/include')
-rw-r--r--nx-X11/programs/Xserver/include/dix.h10
-rw-r--r--nx-X11/programs/Xserver/include/resource.h8
2 files changed, 9 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/include/dix.h b/nx-X11/programs/Xserver/include/dix.h
index 4b9c7749c..0b08b46a9 100644
--- a/nx-X11/programs/Xserver/include/dix.h
+++ b/nx-X11/programs/Xserver/include/dix.h
@@ -138,13 +138,13 @@ SOFTWARE.
}
#define VERIFY_DRAWABLE(pDraw, did, client)\
- SECURITY_VERIFY_DRAWABLE(pDraw, did, client, SecurityUnknownAccess)
+ SECURITY_VERIFY_DRAWABLE(pDraw, did, client, DixUnknownAccess)
#define VERIFY_GEOMETRABLE(pDraw, did, client)\
- SECURITY_VERIFY_GEOMETRABLE(pDraw, did, client, SecurityUnknownAccess)
+ SECURITY_VERIFY_GEOMETRABLE(pDraw, did, client, DixUnknownAccess)
#define VERIFY_GC(pGC, rid, client)\
- SECURITY_VERIFY_GC(pGC, rid, client, SecurityUnknownAccess)
+ SECURITY_VERIFY_GC(pGC, rid, client, DixUnknownAccess)
#else /* not XCSECURITY */
@@ -255,8 +255,8 @@ SOFTWARE.
if ((stuff->gc == INVALID) || (client->lastGCID != stuff->gc) ||\
(client->lastDrawableID != drawID))\
{\
- SECURITY_VERIFY_GEOMETRABLE(pDraw, drawID, client, SecurityWriteAccess);\
- SECURITY_VERIFY_GC(pGC, stuff->gc, client, SecurityReadAccess);\
+ SECURITY_VERIFY_GEOMETRABLE(pDraw, drawID, client, DixWriteAccess);\
+ SECURITY_VERIFY_GC(pGC, stuff->gc, client, DixReadAccess);\
if ((pGC->depth != pDraw->depth) ||\
(pGC->pScreen != pDraw->pScreen))\
return (BadMatch);\
diff --git a/nx-X11/programs/Xserver/include/resource.h b/nx-X11/programs/Xserver/include/resource.h
index 5e169e093..164e7ccfc 100644
--- a/nx-X11/programs/Xserver/include/resource.h
+++ b/nx-X11/programs/Xserver/include/resource.h
@@ -220,10 +220,10 @@ extern void * LookupClientResourceComplex(
* simultaneously.
*/
-#define SecurityUnknownAccess 0 /* don't know intentions */
-#define SecurityReadAccess (1<<0) /* inspecting the object */
-#define SecurityWriteAccess (1<<1) /* changing the object */
-#define SecurityDestroyAccess (1<<2) /* destroying the object */
+#define DixUnknownAccess 0 /* don't know intentions */
+#define DixReadAccess (1<<0) /* inspecting the object */
+#define DixWriteAccess (1<<1) /* changing the object */
+#define DixDestroyAccess (1<<2) /* destroying the object */
#ifdef XCSECURITY