xserver: Branch 'master'

[Eamon Walsh]

 Xext/xselinux.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2538fc0d893a150e978355d281750f0a989728a7
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Tue Nov 25 18:18:46 2008 -0500

    xselinux: don't pass a NULL key string to selabel_lookup().

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 945984d..0e8f254 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -474,7 +474,7 @@ SELinuxLabelClient(ClientPtr client)
     /* Try to get a context from the socket */
     if (fd < 0 || getpeercon(fd, &ctx) < 0) {
 	/* Otherwise, fall back to a default context */
-	if (selabel_lookup(label_hnd, &ctx, NULL, SELABEL_X_CLIENT) < 0)
+	if (selabel_lookup(label_hnd, &ctx, "remote", SELABEL_X_CLIENT) < 0)
 	    FatalError("SELinux: failed to look up remote-client context\n");
     }