xserver: Branch 'master'

[Eamon Walsh]

 Xext/xselinux.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ed597f19fdc3017dde6d1452b5cdf8ddcd69a5b1
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Tue Nov 25 19:36:31 2008 -0500

    xselinux: use "raw context" variants of getpeercon() and getcon().

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 0e8f254..93ea05b 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -472,7 +472,7 @@ SELinuxLabelClient(ClientPtr client)
     sidput(obj->sid);
 
     /* Try to get a context from the socket */
-    if (fd < 0 || getpeercon(fd, &ctx) < 0) {
+    if (fd < 0 || getpeercon_raw(fd, &ctx) < 0) {
 	/* Otherwise, fall back to a default context */
 	if (selabel_lookup(label_hnd, &ctx, "remote", SELABEL_X_CLIENT) < 0)
 	    FatalError("SELinux: failed to look up remote-client context\n");
@@ -537,7 +537,7 @@ SELinuxLabelInitial(void)
     sidput(subj->sid);
 
     /* Use the context of the X server process for the serverClient */
-    if (getcon(&ctx) < 0)
+    if (getcon_raw(&ctx) < 0)
 	FatalError("SELinux: couldn't get context of X server process\n");
 
     /* Get a SID from the context */