diff options
| author | Adam Jackson <ajax@redhat.com> | 2009-03-27 15:56:15 -0400 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-07-29 15:50:06 -0700 |
| commit | 4d349b6c333449517913a5e981b4fc3155da4855 (patch) | |
| tree | ba957fc89bae44ae623c28b54583d38f9f33dd8f | |
| parent | d0875154f4f4b751264a2f6781500e97409a499b (diff) | |
selinux: Only activate if policy says to be an object manager
(cherry picked from commit 283a081572d8db787c77d09e5ba6bcadebf4f7fe)
| -rw-r--r-- | Xext/xselinux.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Xext/xselinux.c b/Xext/xselinux.c index 4f4254abc..3124eb9b7 100644 --- a/Xext/xselinux.c +++ b/Xext/xselinux.c @@ -1989,6 +1989,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: |