From 242c526cf374fda75c644394261afd5a5d8b42a0 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 11 Mar 2009 22:31:36 +0000 Subject: [PATCH] erk --- xserver-1.6.0-selinux-less.patch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 xserver-1.6.0-selinux-less.patch diff --git a/xserver-1.6.0-selinux-less.patch b/xserver-1.6.0-selinux-less.patch new file mode 100644 index 0000000..d7322a2 --- /dev/null +++ b/xserver-1.6.0-selinux-less.patch @@ -0,0 +1,27 @@ +From 98a389d6fb609cdecbf6422eb6a3a9b6bf503ec2 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +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 +