xserver: Branch 'server-1.6-branch'

[Eamon Walsh]

 Xext/xselinux.c |    9 ---------
 1 file changed, 9 deletions(-)

New commits:
commit a9f85dcefbadfe44d8c58ad08430aaadb8c59d34
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Mon May 11 15:27:46 2009 -0400

    xselinux: Relax ownership restriction on SetSelectionUseContext.
    
    Instead, clients should keep track of the selection instances they use.
    (cherry picked from commit 0952d12717031e9dda9e48123bb922d0f4e81834)
    
    Signed-off-by: Eamon Walsh <ewalsh at tycho.nsa.gov>

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 2a32bb8..6c99c29 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1349,15 +1349,6 @@ ProcSELinuxSetCreateContext(ClientPtr client, unsigned offset)
 	    goto out;
 	privPtr = &serverClient->devPrivates;
     }
-    else if (offset == USE_SEL) {
-	/* Selection use context currently requires no selections owned */
-	Selection *pSel;
-	for (pSel = CurrentSelections; pSel; pSel = pSel->next)
-	    if (pSel->client == client) {
-		rc = BadMatch;
-		goto out;
-	    }
-    }
 
     ptr = dixLookupPrivate(privPtr, subjectKey);
     pSid = (security_id_t *)(ptr + offset);