xserver: Branch 'XACE-SELINUX'

[Eamon Walsh]

 hw/xgl/xglscreen.c |    3 ++-
 render/mirect.c    |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
diff-tree 526f40434c86548830c4f72940462b6253fe9790 (from 6adeba17301a309be2f34cd51eca84a13d5503fd)
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Fri Oct 12 18:18:00 2007 -0400

    NULL is not a valid argument to CreatePicture, please use serverClient
    as the client argument if no real client is creating the object.

diff --git a/hw/xgl/xglscreen.c b/hw/xgl/xglscreen.c
index 9b7297b..6bd91b7 100644
--- a/hw/xgl/xglscreen.c
+++ b/hw/xgl/xglscreen.c
@@ -463,7 +463,8 @@ xglCreateSolidAlphaPicture (ScreenPtr pS
 
     tmpval[0] = xTrue;
     pScreenPriv->pSolidAlpha = CreatePicture (0, &pPixmap->drawable, pFormat,
-					      CPRepeat, tmpval, 0, &error);
+					      CPRepeat, tmpval,
+					      serverClient, &error);
     (*pScreen->DestroyPixmap) (pPixmap);
 
     if (pScreenPriv->pSolidAlpha)
diff --git a/render/mirect.c b/render/mirect.c
index 87767a7..fa9dab8 100644
--- a/render/mirect.c
+++ b/render/mirect.c
@@ -158,7 +158,7 @@ miCompositeRects (CARD8		op,
 	
 	tmpval[0] = xTrue;
 	pSrc = CreatePicture (0, &pPixmap->drawable, rgbaFormat,
-			      CPRepeat, tmpval, 0, &error);
+			      CPRepeat, tmpval, serverClient, &error);
 			      
 	if (!pSrc)
 	    goto bail4;