commit: f9897d936fcad0c175a4a54dc9e14561fef9236d Author: Chris PeBenito <pebenito <AT> ieee <DOT> org> AuthorDate: Thu Jan 28 16:30:40 2021 +0000 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> CommitDate: Mon Feb 1 01:21:42 2021 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=f9897d93
sysnetwork: Merge dhcpc_manage_samba tunable block with existing samba block. This moves the existing samba_manage_config(dhcpc_t) that is not tunable into the tunable block. Signed-off-by: Chris PeBenito <pebenito <AT> ieee.org> Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org> policy/modules/system/sysnetwork.te | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/policy/modules/system/sysnetwork.te b/policy/modules/system/sysnetwork.te index a8fe42d6..ee768012 100644 --- a/policy/modules/system/sysnetwork.te +++ b/policy/modules/system/sysnetwork.te @@ -184,18 +184,6 @@ ifdef(`init_systemd',` init_search_units(dhcpc_t) ') -optional_policy(` - tunable_policy(`dhcpc_manage_samba',` - samba_manage_var_files(dhcpc_t) - init_exec_script_files(dhcpc_t) - init_get_system_status(dhcpc_t) - samba_stop(dhcpc_t) - samba_start(dhcpc_t) - samba_reload(dhcpc_t) - samba_status(dhcpc_t) - ') -') - optional_policy(` avahi_domtrans(dhcpc_t) ') @@ -252,7 +240,16 @@ optional_policy(` ') optional_policy(` - samba_manage_config(dhcpc_t) + tunable_policy(`dhcpc_manage_samba',` + samba_manage_config(dhcpc_t) + samba_manage_var_files(dhcpc_t) + init_exec_script_files(dhcpc_t) + init_get_system_status(dhcpc_t) + samba_stop(dhcpc_t) + samba_start(dhcpc_t) + samba_reload(dhcpc_t) + samba_status(dhcpc_t) + ') ') optional_policy(`