xserver: Branch 'master'

[Eamon Walsh]

 dix/dixutils.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree ab1886df73b73360fa3bd7ce8e01affc074cbc8d (from 60cdc592fe042c03ceb5d4c3344acfbbf5d8ae28)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Thu Dec 14 15:42:19 2006 -0500

    Add new, combined dix lookup functions (tweak).

diff --git a/dix/dixutils.c b/dix/dixutils.c
index f9980c5..3479ddc 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -298,7 +298,7 @@ _X_EXPORT pointer
 SecurityLookupDrawable(XID id, ClientPtr client, Mask access_mode)
 {
     DrawablePtr pDraw;
-    int i = dixLookupDrawable(&pDraw, id, client, access_mode, TRUE);
+    int i = dixLookupDrawable(&pDraw, id, client, M_DRAWABLE, access_mode);
     return (i == Success) ? pDraw : NULL;
 }