xorg-x11-server/xserver-1.6.0-selinux-less.patch
Adam Jackson 242c526cf3 erk
2009-03-11 22:31:36 +00:00

28 lines
761 B
Diff

From 98a389d6fb609cdecbf6422eb6a3a9b6bf503ec2 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Wed, 11 Mar 2009 12:59:36 -0400
Subject: [PATCH] selinux: Don't enable unless there's something to do.
---
Xext/xselinux.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index f8495ea..042d134 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1952,6 +1952,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:
--
1.6.1.3