From db9cae615c1312953397b99a9a90ecc5e29e9810 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Wed, 16 Mar 2011 08:47:40 -0400 Subject: [PATCH] Rearrange lines for xauth change. --- policy/modules/services/xserver.fc | 2 +- policy/modules/services/xserver.te | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/policy/modules/services/xserver.fc b/policy/modules/services/xserver.fc index abfa1b2ad..4966c9433 100644 --- a/policy/modules/services/xserver.fc +++ b/policy/modules/services/xserver.fc @@ -6,9 +6,9 @@ HOME_DIR/\.fonts(/.*)? gen_context(system_u:object_r:user_fonts_t,s0) HOME_DIR/\.fonts/auto(/.*)? gen_context(system_u:object_r:user_fonts_cache_t,s0) HOME_DIR/\.fonts\.cache-.* -- gen_context(system_u:object_r:user_fonts_cache_t,s0) HOME_DIR/\.ICEauthority.* -- gen_context(system_u:object_r:iceauth_home_t,s0) +HOME_DIR/\.serverauth.* -- gen_context(system_u:object_r:xauth_home_t,s0) HOME_DIR/\.xauth.* -- gen_context(system_u:object_r:xauth_home_t,s0) HOME_DIR/\.Xauthority.* -- gen_context(system_u:object_r:xauth_home_t,s0) -HOME_DIR/\.serverauth.* -- gen_context(system_u:object_r:xauth_home_t,s0) # # /dev diff --git a/policy/modules/services/xserver.te b/policy/modules/services/xserver.te index 7faea288b..83febde45 100644 --- a/policy/modules/services/xserver.te +++ b/policy/modules/services/xserver.te @@ -265,13 +265,13 @@ files_tmp_filetrans(xauth_t, xauth_tmp_t, { file dir }) allow xdm_t xauth_home_t:file manage_file_perms; userdom_user_home_dir_filetrans(xdm_t, xauth_home_t, file) +kernel_request_load_module(xauth_t) + domain_use_interactive_fds(xauth_t) files_read_etc_files(xauth_t) files_search_pids(xauth_t) -kernel_request_load_module(xauth_t) - fs_getattr_xattr_fs(xauth_t) fs_search_auto_mountpoints(xauth_t)