xserver: Branch 'server-1.9-branch'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Wed Feb 16 17:05:15 PST 2011
Xext/xselinux_ext.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit f60f586c64502077350b7a4ed713535d6e671b07
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jan 20 23:01:03 2011 -0500
xselinux: Fix GetDrawableContext
M_DRAWABLE_PIXMAP is the lookup mask to dixLookupDrawable, and _not_ the
type value in the drawable itself.
Signed-off-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Eamon Walsh <ewalsh at tycho.nsa.gov>
Signed-off-by: Keith Packard <keithp at keithp.com>
(cherry picked from commit ac0a00a840a5d8d8374e5db2b849e5959550ca4e)
diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c
index 93c1b59..374571c 100644
--- a/Xext/xselinux_ext.c
+++ b/Xext/xselinux_ext.c
@@ -231,13 +231,11 @@ ProcSELinuxGetDrawableContext(ClientPtr client)
REQUEST(SELinuxGetContextReq);
REQUEST_SIZE_MATCH(SELinuxGetContextReq);
- rc = dixLookupDrawable(&pDraw, stuff->id, client,
- M_WINDOW | M_DRAWABLE_PIXMAP,
- DixGetAttrAccess);
+ rc = dixLookupDrawable(&pDraw, stuff->id, client, 0, DixGetAttrAccess);
if (rc != Success)
return rc;
- if (pDraw->type == M_DRAWABLE_PIXMAP)
+ if (pDraw->type == DRAWABLE_PIXMAP)
privatePtr = &((PixmapPtr)pDraw)->devPrivates;
else
privatePtr = &((WindowPtr)pDraw)->devPrivates;
More information about the xorg-commit
mailing list