From e2e1b6721bb297c20ee1508afc3015549234d0b2 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Mon, 8 Mar 2010 10:00:55 -0500 Subject: [PATCH] Minor style fixes. --- policy/modules/admin/logwatch.te | 15 ++++++++------- policy/modules/admin/shorewall.te | 10 +++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/policy/modules/admin/logwatch.te b/policy/modules/admin/logwatch.te index 9b08c52f5..fa5fec9e0 100644 --- a/policy/modules/admin/logwatch.te +++ b/policy/modules/admin/logwatch.te @@ -93,13 +93,6 @@ sysnet_dns_name_resolve(logwatch_t) sysnet_exec_ifconfig(logwatch_t) userdom_dontaudit_search_user_home_dirs(logwatch_t) -tunable_policy(`use_nfs_home_dirs',` - fs_list_nfs(logwatch_t) -') - -tunable_policy(`use_samba_home_dirs',` - fs_list_cifs(logwatch_t) -') mta_send_mail(logwatch_t) @@ -108,6 +101,14 @@ ifdef(`distro_redhat',` files_getattr_all_file_type_fs(logwatch_t) ') +tunable_policy(`use_nfs_home_dirs',` + fs_list_nfs(logwatch_t) +') + +tunable_policy(`use_samba_home_dirs',` + fs_list_cifs(logwatch_t) +') + optional_policy(` apache_read_log(logwatch_t) ') diff --git a/policy/modules/admin/shorewall.te b/policy/modules/admin/shorewall.te index 371f6a66b..5b8b21945 100644 --- a/policy/modules/admin/shorewall.te +++ b/policy/modules/admin/shorewall.te @@ -47,11 +47,6 @@ list_dirs_pattern(shorewall_t, shorewall_etc_t, shorewall_etc_t) manage_files_pattern(shorewall_t, shorewall_lock_t, shorewall_lock_t) files_lock_filetrans(shorewall_t, shorewall_lock_t, file) -exec_files_pattern(shorewall_t, shorewall_var_lib_t, shorewall_var_lib_t) -manage_dirs_pattern(shorewall_t, shorewall_var_lib_t, shorewall_var_lib_t) -manage_files_pattern(shorewall_t, shorewall_var_lib_t, shorewall_var_lib_t) -files_var_lib_filetrans(shorewall_t, shorewall_var_lib_t, { dir file }) - manage_files_pattern(shorewall_t, shorewall_log_t, shorewall_log_t) manage_dirs_pattern(shorewall_t, shorewall_log_t, shorewall_log_t) logging_log_filetrans(shorewall_t, shorewall_log_t, { file dir }) @@ -60,6 +55,11 @@ manage_dirs_pattern(shorewall_t, shorewall_tmp_t, shorewall_tmp_t) manage_files_pattern(shorewall_t, shorewall_tmp_t, shorewall_tmp_t) files_tmp_filetrans(shorewall_t, shorewall_tmp_t, { file dir }) +exec_files_pattern(shorewall_t, shorewall_var_lib_t, shorewall_var_lib_t) +manage_dirs_pattern(shorewall_t, shorewall_var_lib_t, shorewall_var_lib_t) +manage_files_pattern(shorewall_t, shorewall_var_lib_t, shorewall_var_lib_t) +files_var_lib_filetrans(shorewall_t, shorewall_var_lib_t, { dir file }) + kernel_read_kernel_sysctls(shorewall_t) kernel_read_network_state(shorewall_t) kernel_read_system_state(shorewall_t)