From 94e424aa9b8c3858fed23eeaba4ef1c2f0d8a68d Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Thu, 28 Jan 2021 11:30:40 -0500 Subject: [PATCH] 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 --- 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 fa80c9f8e..e7124c85b 100644 --- a/policy/modules/system/sysnetwork.te +++ b/policy/modules/system/sysnetwork.te @@ -182,18 +182,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) ') @@ -250,7 +238,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(`