diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-01-20 23:01:03 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-02-02 14:33:01 -0800 |
| commit | ac0a00a840a5d8d8374e5db2b849e5959550ca4e (patch) | |
| tree | 7c1176cae6b3a2bf102771c34e62a7e9d94166c9 | |
| parent | be3be7580b6f6fd2f7fa4d4abfe5e1ab19470223 (diff) | |
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@redhat.com>
Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | Xext/xselinux_ext.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c index 93c1b595f..374571c4b 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; |