commit: b1e0a75ca9dd68264191b04214a4e18d4312b8fc Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be> AuthorDate: Sun Aug 31 16:04:34 2014 +0000 Commit: Jason Zaman <gentoo <AT> perfinion <DOT> com> CommitDate: Sun Aug 31 16:04:34 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=b1e0a75c
Move gentoo specifics downward --- policy/modules/contrib/courier.te | 53 ++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/policy/modules/contrib/courier.te b/policy/modules/contrib/courier.te index 9bd64f5..5660ef5 100644 --- a/policy/modules/contrib/courier.te +++ b/policy/modules/contrib/courier.te @@ -116,10 +116,6 @@ miscfiles_read_localization(courier_authdaemon_t) userdom_dontaudit_search_user_home_dirs(courier_authdaemon_t) -ifdef(`distro_gentoo',` - read_lnk_files_pattern(courier_authdaemon_t, courier_var_lib_t, courier_var_lib_t) -') - ######################################## # # Calendar (PCP) local policy @@ -148,14 +144,6 @@ miscfiles_read_localization(courier_pop_t) userdom_manage_user_home_content_files(courier_pop_t) userdom_manage_user_home_content_dirs(courier_pop_t) -ifdef(`distro_gentoo',` - files_search_var_lib(courier_pop_t) - search_dirs_pattern(courier_pop_t, courier_var_lib_t, courier_var_lib_t) - read_lnk_files_pattern(courier_pop_t, courier_var_lib_t, courier_var_lib_t) - - courier_authdaemon_rw_inherited_stream_sockets(courier_pop_t) -') - ######################################## # # TCPd local policy @@ -186,11 +174,6 @@ dev_read_urand(courier_tcpd_t) miscfiles_read_localization(courier_tcpd_t) -ifdef(`distro_gentoo',` - courier_authdaemon_stream_connect(courier_tcpd_t) - courier_domtrans_authdaemon(courier_tcpd_t) -') - ######################################## # # Webmail local policy @@ -198,12 +181,42 @@ ifdef(`distro_gentoo',` kernel_read_kernel_sysctls(courier_sqwebmail_t) +optional_policy(` + cron_system_entry(courier_sqwebmail_t, courier_sqwebmail_exec_t) +') + ifdef(`distro_gentoo',` + + ######################################## + # + # Courier authdaemon policy + # + read_lnk_files_pattern(courier_authdaemon_t, courier_var_lib_t, courier_var_lib_t) + optional_policy(` mysql_stream_connect(courier_authdaemon_t) ') -') -optional_policy(` - cron_system_entry(courier_sqwebmail_t, courier_sqwebmail_exec_t) + ######################################## + # + # Courier imap daemon policy + # + + + ######################################## + # + # Courier pop daemon policy + # + files_search_var_lib(courier_pop_t) + search_dirs_pattern(courier_pop_t, courier_var_lib_t, courier_var_lib_t) + read_lnk_files_pattern(courier_pop_t, courier_var_lib_t, courier_var_lib_t) + + courier_authdaemon_rw_inherited_stream_sockets(courier_pop_t) + + ######################################## + # + # Courier tcpd daemon policy + # + courier_authdaemon_stream_connect(courier_tcpd_t) + courier_domtrans_authdaemon(courier_tcpd_t) ')