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/dix/dixfonts.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/dix/dixfonts.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/dixfonts.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/dix/dixfonts.c b/nx-X11/programs/Xserver/dix/dixfonts.c index aa90b8769..f7d047c2d 100644 --- a/nx-X11/programs/Xserver/dix/dixfonts.c +++ b/nx-X11/programs/Xserver/dix/dixfonts.c @@ -1197,7 +1197,7 @@ doPolyText(ClientPtr client, register PTclosurePtr c) if (c->slept && c->pDraw && c->pDraw != (DrawablePtr)SecurityLookupIDByClass(client, c->did, - RC_DRAWABLE, SecurityWriteAccess)) + RC_DRAWABLE, DixWriteAccess)) { /* Our drawable has disappeared. Treat like client died... ask the FPE code to clean up after client and avoid further @@ -1227,7 +1227,7 @@ doPolyText(ClientPtr client, register PTclosurePtr c) | ((Font)*(c->pElt+2)) << 16 | ((Font)*(c->pElt+1)) << 24; pFont = (FontPtr)SecurityLookupIDByType(client, fid, RT_FONT, - SecurityReadAccess); + DixReadAccess); if (!pFont) { client->errorValue = fid; @@ -1489,7 +1489,7 @@ doImageText(ClientPtr client, register ITclosurePtr c) if (c->slept && c->pDraw && c->pDraw != (DrawablePtr)SecurityLookupIDByClass(client, c->did, - RC_DRAWABLE, SecurityWriteAccess)) + RC_DRAWABLE, DixWriteAccess)) { /* Our drawable has disappeared. Treat like client died... ask the FPE code to clean up after client. */ @@ -2044,7 +2044,7 @@ FontPtr find_old_font(XID id) { return (FontPtr) SecurityLookupIDByType(NullClient, id, RT_NONE, - SecurityUnknownAccess); + DixUnknownAccess); } Font |