xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 283a081572d8db787c77d09e5ba6bcadebf4f7fe
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Mar 27 15:56:15 2009 -0400

    selinux: Only activate if policy says to be an object manager

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index dfeef2f..4a1fe00 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1971,6 +1971,10 @@ SELinuxExtensionInit(INITARGS)
 	return;
     }
 
+    /* Don't init unless there's something to do */
+    if (!security_get_boolean_active("xserver_object_manager"))
+        return;
+
     /* Check SELinux mode in configuration file */
     switch(selinuxEnforcingState) {
     case SELINUX_MODE_DISABLED: