From 1779bef032ef8103f720842a0283c6eb748c7127 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Mon, 20 Aug 2007 18:54:29 +0000 Subject: [PATCH] trunk: fix gdm xsession scripts on redhat machines. --- policy/modules/services/xserver.fc | 5 +++++ policy/modules/services/xserver.te | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/policy/modules/services/xserver.fc b/policy/modules/services/xserver.fc index 084c18df..1e86113a 100644 --- a/policy/modules/services/xserver.fc +++ b/policy/modules/services/xserver.fc @@ -34,6 +34,11 @@ HOME_DIR/\.Xauthority.* -- gen_context(system_u:object_r:ROLE_xauth_home_t,s0) /etc/X11/wdm/Xstartup.* -- gen_context(system_u:object_r:xsession_exec_t,s0) /etc/X11/Xsession[^/]* -- gen_context(system_u:object_r:xsession_exec_t,s0) +ifdef(`distro_redhat',` +/etc/gdm/PostSession/.* -- gen_context(system_u:object_r:xsession_exec_t,s0) +/etc/gdm/PreSession/.* -- gen_context(system_u:object_r:xsession_exec_t,s0) +') + # # /opt # diff --git a/policy/modules/services/xserver.te b/policy/modules/services/xserver.te index 27475d89..363c2b65 100644 --- a/policy/modules/services/xserver.te +++ b/policy/modules/services/xserver.te @@ -1,5 +1,5 @@ -policy_module(xserver,1.5.1) +policy_module(xserver,1.5.2) ######################################## #