| 1 |
commit: cd46d984ef7a811f699cff8190c8154bb87a1c78 |
| 2 |
Author: Laurent Bigonville <bigon <AT> bigon <DOT> be> |
| 3 |
AuthorDate: Mon Sep 10 16:11:13 2012 +0000 |
| 4 |
Commit: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> |
| 5 |
CommitDate: Fri Sep 28 17:53:18 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=cd46d984 |
| 7 |
|
| 8 |
Add Debian locations for GDM 3 |
| 9 |
|
| 10 |
--- |
| 11 |
policy/modules/kernel/corecommands.fc | 1 + |
| 12 |
policy/modules/services/xserver.fc | 15 +++++++++------ |
| 13 |
2 files changed, 10 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/policy/modules/kernel/corecommands.fc b/policy/modules/kernel/corecommands.fc |
| 16 |
index 4592f8a..2596ca3 100644 |
| 17 |
--- a/policy/modules/kernel/corecommands.fc |
| 18 |
+++ b/policy/modules/kernel/corecommands.fc |
| 19 |
@@ -322,6 +322,7 @@ ifdef(`distro_gentoo',` |
| 20 |
|
| 21 |
ifdef(`distro_debian',` |
| 22 |
/usr/lib/ConsoleKit/.* -- gen_context(system_u:object_r:bin_t,s0) |
| 23 |
+/usr/lib/gdm3/.* -- gen_context(system_u:object_r:bin_t,s0) |
| 24 |
') |
| 25 |
|
| 26 |
ifdef(`distro_gentoo', ` |
| 27 |
|
| 28 |
diff --git a/policy/modules/services/xserver.fc b/policy/modules/services/xserver.fc |
| 29 |
index 30fc0e8..433d690 100644 |
| 30 |
--- a/policy/modules/services/xserver.fc |
| 31 |
+++ b/policy/modules/services/xserver.fc |
| 32 |
@@ -19,9 +19,9 @@ HOME_DIR/\.Xauthority.* -- gen_context(system_u:object_r:xauth_home_t,s0) |
| 33 |
# |
| 34 |
# /etc |
| 35 |
# |
| 36 |
-/etc/gdm/PostSession/.* -- gen_context(system_u:object_r:xsession_exec_t,s0) |
| 37 |
-/etc/gdm/PreSession/.* -- gen_context(system_u:object_r:xsession_exec_t,s0) |
| 38 |
-/etc/gdm/Xsession -- gen_context(system_u:object_r:xsession_exec_t,s0) |
| 39 |
+/etc/gdm(3)?/PostSession/.* -- gen_context(system_u:object_r:xsession_exec_t,s0) |
| 40 |
+/etc/gdm(3)?/PreSession/.* -- gen_context(system_u:object_r:xsession_exec_t,s0) |
| 41 |
+/etc/gdm(3)?/Xsession -- gen_context(system_u:object_r:xsession_exec_t,s0) |
| 42 |
|
| 43 |
/etc/rc\.d/init\.d/xfree86-common -- gen_context(system_u:object_r:xserver_exec_t,s0) |
| 44 |
|
| 45 |
@@ -57,9 +57,10 @@ HOME_DIR/\.Xauthority.* -- gen_context(system_u:object_r:xauth_home_t,s0) |
| 46 |
# /usr |
| 47 |
# |
| 48 |
|
| 49 |
+/usr/(s)?bin/gdm(3)? -- gen_context(system_u:object_r:xdm_exec_t,s0) |
| 50 |
/usr/(s)?bin/gdm-binary -- gen_context(system_u:object_r:xdm_exec_t,s0) |
| 51 |
/usr/(s)?bin/lxdm(-binary)? -- gen_context(system_u:object_r:xdm_exec_t,s0) |
| 52 |
-/usr/(s)?bin/[xgkw]dm -- gen_context(system_u:object_r:xdm_exec_t,s0) |
| 53 |
+/usr/(s)?bin/[xkw]dm -- gen_context(system_u:object_r:xdm_exec_t,s0) |
| 54 |
/usr/bin/gpe-dm -- gen_context(system_u:object_r:xdm_exec_t,s0) |
| 55 |
/usr/bin/iceauth -- gen_context(system_u:object_r:iceauth_exec_t,s0) |
| 56 |
/usr/bin/slim -- gen_context(system_u:object_r:xdm_exec_t,s0) |
| 57 |
@@ -90,18 +91,20 @@ ifndef(`distro_debian',` |
| 58 |
|
| 59 |
/var/[xgkw]dm(/.*)? gen_context(system_u:object_r:xserver_log_t,s0) |
| 60 |
|
| 61 |
+/var/lib/gdm(3)?(/.*)? gen_context(system_u:object_r:xdm_var_lib_t,s0) |
| 62 |
/var/lib/lxdm(/.*)? gen_context(system_u:object_r:xdm_var_lib_t,s0) |
| 63 |
/var/lib/[xkw]dm(/.*)? gen_context(system_u:object_r:xdm_var_lib_t,s0) |
| 64 |
/var/lib/xkb(/.*)? gen_context(system_u:object_r:xkb_var_lib_t,s0) |
| 65 |
|
| 66 |
/var/log/[kwx]dm\.log.* -- gen_context(system_u:object_r:xserver_log_t,s0) |
| 67 |
/var/log/lxdm\.log -- gen_context(system_u:object_r:xserver_log_t,s0) |
| 68 |
-/var/log/gdm(/.*)? gen_context(system_u:object_r:xserver_log_t,s0) |
| 69 |
+/var/log/gdm(3)?(/.*)? gen_context(system_u:object_r:xserver_log_t,s0) |
| 70 |
/var/log/slim\.log -- gen_context(system_u:object_r:xserver_log_t,s0) |
| 71 |
/var/log/XFree86.* -- gen_context(system_u:object_r:xserver_log_t,s0) |
| 72 |
/var/log/Xorg.* -- gen_context(system_u:object_r:xserver_log_t,s0) |
| 73 |
|
| 74 |
-/var/run/[gx]dm\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0) |
| 75 |
+/var/run/gdm(3)?\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0) |
| 76 |
+/var/run/xdm\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0) |
| 77 |
/var/run/lxdm\.auth -- gen_context(system_u:object_r:xdm_var_run_t,s0) |
| 78 |
/var/run/lxdm\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0) |
| 79 |
/var/run/lxdm(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0) |
Archives