summaryrefslogtreecommitdiff
authorAdam Jackson <ajax@redhat.com>2009-03-27 19:56:15 (GMT)
committer Adam Jackson <ajax@redhat.com>2009-03-27 19:56:15 (GMT)
commit283a081572d8db787c77d09e5ba6bcadebf4f7fe (patch) (side-by-side diff)
tree0b639edd29934e6568ef860c514c92b1a14ab908
parent8e7facfe3013abda12a0c39ad8b4d025618077a7 (diff)
downloadxserver-283a081572d8db787c77d09e5ba6bcadebf4f7fe.zip
xserver-283a081572d8db787c77d09e5ba6bcadebf4f7fe.tar.gz
selinux: Only activate if policy says to be an object manager
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Xext/xselinux.c4
1 files changed, 4 insertions, 0 deletions
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: