From 283a081572d8db787c77d09e5ba6bcadebf4f7fe Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 27 Mar 2009 15:56:15 -0400
Subject: [PATCH] selinux: Only activate if policy says to be an object manager

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

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index dfeef2f21..4a1fe004b 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: