From 9e195ea6aeb8b7e910a3aa7986597238a598677b Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Tue, 2 Feb 2021 08:46:41 -0500 Subject: [PATCH] dpkg, aptcatcher, milter, mysql, systemd: Rename interfaces. Rename interfaces from a7f3fdabadd47279800688d5ee2e19662b7fc58b. Signed-off-by: Chris PeBenito --- policy/modules/admin/dpkg.te | 8 ++++---- policy/modules/services/aptcacher.if | 2 +- policy/modules/services/milter.if | 2 +- policy/modules/services/mysql.if | 4 ++-- policy/modules/system/systemd.if | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/policy/modules/admin/dpkg.te b/policy/modules/admin/dpkg.te index 97d40adc7..39854feba 100644 --- a/policy/modules/admin/dpkg.te +++ b/policy/modules/admin/dpkg.te @@ -309,7 +309,7 @@ optional_policy(` optional_policy(` aptcacher_filetrans_cache_dir(dpkg_script_t) - aptcacher_filetrans_conf_dir(dpkg_script_t) + aptcacher_etc_filetrans_conf_dir(dpkg_script_t) aptcacher_filetrans_log_dir(dpkg_script_t) ') @@ -330,7 +330,7 @@ optional_policy(` ') optional_policy(` - milter_filetrans_spamass_state(dpkg_script_t) + milter_var_lib_filetrans_spamass_state(dpkg_script_t) ') optional_policy(` @@ -342,8 +342,8 @@ optional_policy(` ') optional_policy(` - mysql_create_db_dir(dpkg_script_t) - mysql_create_log_dir(dpkg_script_t) + mysql_var_lib_filetrans_db_dir(dpkg_script_t) + mysql_log_filetrans_log_dir(dpkg_script_t) ') optional_policy(` diff --git a/policy/modules/services/aptcacher.if b/policy/modules/services/aptcacher.if index bef833322..40f19560b 100644 --- a/policy/modules/services/aptcacher.if +++ b/policy/modules/services/aptcacher.if @@ -110,7 +110,7 @@ interface(`aptcacher_filetrans_cache_dir',` ## ## # -interface(`aptcacher_filetrans_conf_dir',` +interface(`aptcacher_etc_filetrans_conf_dir',` gen_require(` type aptcacher_conf_t; ') diff --git a/policy/modules/services/milter.if b/policy/modules/services/milter.if index 13b054987..5323b6e02 100644 --- a/policy/modules/services/milter.if +++ b/policy/modules/services/milter.if @@ -108,7 +108,7 @@ interface(`milter_manage_spamass_state',` ## ## # -interface(`milter_filetrans_spamass_state',` +interface(`milter_var_lib_filetrans_spamass_state',` gen_require(` type spamass_milter_state_t; ') diff --git a/policy/modules/services/mysql.if b/policy/modules/services/mysql.if index b6746097e..f8d7c373d 100644 --- a/policy/modules/services/mysql.if +++ b/policy/modules/services/mysql.if @@ -251,7 +251,7 @@ interface(`mysql_manage_db_files',` ## ## # -interface(`mysql_create_db_dir',` +interface(`mysql_var_lib_filetrans_db_dir',` gen_require(` type mysqld_db_t; ') @@ -357,7 +357,7 @@ interface(`mysql_write_log',` ## ## # -interface(`mysql_create_log_dir',` +interface(`mysql_log_filetrans_log_dir',` gen_require(` type mysqld_log_t; ') diff --git a/policy/modules/system/systemd.if b/policy/modules/system/systemd.if index ac431aba0..29a561c7d 100644 --- a/policy/modules/system/systemd.if +++ b/policy/modules/system/systemd.if @@ -546,7 +546,7 @@ interface(`systemd_run_passwd_agent',` type systemd_passwd_agent_t, systemd_passwd_agent_exec_t; ') - domain_auto_transition_pattern($1, systemd_passwd_agent_exec_t, systemd_passwd_agent_t) + domtrans_pattern($1, systemd_passwd_agent_exec_t, systemd_passwd_agent_t) allow systemd_passwd_agent_t $1:fd use; role $2 types systemd_passwd_agent_t; ')