From e335910197a56b18e42a5154735aa033793270de Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Wed, 5 Aug 2009 11:01:37 -0400 Subject: [PATCH] Add missing compatibility aliases for xdm_xserver*_t types. When collapsing all of the xdm_xserver*_t types into xserver*_t, aliases for compatibility were mistakenly not added to the policy. --- Changelog | 2 ++ policy/modules/services/xserver.te | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index 93f0489b..ed012d12 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +- Add missing compatibility aliases for xdm_xserver*_t types. + * Thu Jul 30 2009 Chris PeBenito - 2.20090730 - Gentoo fixes for init scripts and system startup. - Remove read_default_t tunable. diff --git a/policy/modules/services/xserver.te b/policy/modules/services/xserver.te index 3423c316..976fb908 100644 --- a/policy/modules/services/xserver.te +++ b/policy/modules/services/xserver.te @@ -1,5 +1,5 @@ -policy_module(xserver, 3.2.0) +policy_module(xserver, 3.2.1) gen_require(` class x_drawable all_x_drawable_perms; @@ -189,7 +189,7 @@ files_type(xkb_var_lib_t) type xserver_t; type xserver_exec_t; typealias xserver_t alias { user_xserver_t staff_xserver_t sysadm_xserver_t }; -typealias xserver_t alias { auditadm_xserver_t secadm_xserver_t }; +typealias xserver_t alias { auditadm_xserver_t secadm_xserver_t xdm_xserver_t }; xserver_object_types_template(xdm) xserver_common_x_domain_template(xdm, xdm_t) init_system_domain(xserver_t, xserver_exec_t) @@ -197,13 +197,13 @@ ubac_constrained(xserver_t) type xserver_tmp_t; typealias xserver_tmp_t alias { user_xserver_tmp_t staff_xserver_tmp_t sysadm_xserver_tmp_t }; -typealias xserver_tmp_t alias { auditadm_xserver_tmp_t secadm_xserver_tmp_t }; +typealias xserver_tmp_t alias { auditadm_xserver_tmp_t secadm_xserver_tmp_t xdm_xserver_tmp_t }; files_tmp_file(xserver_tmp_t) ubac_constrained(xserver_tmp_t) type xserver_tmpfs_t; typealias xserver_tmpfs_t alias { user_xserver_tmpfs_t staff_xserver_tmpfs_t sysadm_xserver_tmpfs_t }; -typealias xserver_tmpfs_t alias { auditadm_xserver_tmpfs_t secadm_xserver_tmpfs_t }; +typealias xserver_tmpfs_t alias { auditadm_xserver_tmpfs_t secadm_xserver_tmpfs_t xdm_xserver_tmpfs_t }; files_tmpfs_file(xserver_tmpfs_t) ubac_constrained(xserver_tmpfs_t)