commit:     e57bc26069d27c092d703ab9e323c9590552a73e
Author:     Chris PeBenito <pebenito <AT> ieee <DOT> org>
AuthorDate: Tue Feb  2 13:46:41 2021 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Feb  6 21:15:09 2021 +0000
URL:        
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=e57bc260

dpkg, aptcatcher, milter, mysql, systemd: Rename interfaces.

Rename interfaces from a7f3fdabadd47279800688d5ee2e19662b7fc58b.

Signed-off-by: Chris PeBenito <pebenito <AT> ieee.org>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 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 6830c795..da365bb2 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 bef83332..40f19560 100644
--- a/policy/modules/services/aptcacher.if
+++ b/policy/modules/services/aptcacher.if
@@ -110,7 +110,7 @@ interface(`aptcacher_filetrans_cache_dir',`
 ##     </summary>
 ## </param>
 #
-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 13b05498..5323b6e0 100644
--- a/policy/modules/services/milter.if
+++ b/policy/modules/services/milter.if
@@ -108,7 +108,7 @@ interface(`milter_manage_spamass_state',`
 ##     </summary>
 ## </param>
 #
-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 e89a66d9..0b2e5685 100644
--- a/policy/modules/services/mysql.if
+++ b/policy/modules/services/mysql.if
@@ -251,7 +251,7 @@ interface(`mysql_manage_db_files',`
 ##     </summary>
 ## </param>
 #
-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',`
 ##     </summary>
 ## </param>
 #
-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 ac431aba..29a561c7 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;
 ')

Reply via email to