[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/, policy/modules/services/

["Jason Zaman" <perfinion@gentoo.org>]

commit:     d83e298072d6c11a5ab55195dbd6392f03da472f
Author:     Russell Coker <russell <AT> coker <DOT> com <DOT> au>
AuthorDate: Sun Feb 13 10:10:09 2022 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 02:13:17 2022 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=d83e2980

remove aliases from 20210203

This patch against version 20220106 removes the typealias rules that were in
version 20210203.  If we include this now then the typealias rules in
question will have been there for 3 consecutive releases.  But if you think
we should wait until after the next release that's OK.

It's obvious that this patch should be included sooner or later, I think now
is a reasonable time.

Signed-off-by: Russell Coker <russell <AT> coker.com.au>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 policy/modules/services/acpi.te         | 1 -
 policy/modules/services/clamav.te       | 1 -
 policy/modules/services/exim.te         | 1 -
 policy/modules/services/ftp.te          | 1 -
 policy/modules/services/irqbalance.te   | 1 -
 policy/modules/services/postfix.te      | 3 +--
 policy/modules/services/spamassassin.te | 1 -
 policy/modules/system/mount.te          | 1 -
 policy/modules/system/selinuxutil.te    | 1 -
 policy/modules/system/systemd.te        | 2 --
 10 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/policy/modules/services/acpi.te b/policy/modules/services/acpi.te
index 92d52182..c4ca7f7f 100644
--- a/policy/modules/services/acpi.te
+++ b/policy/modules/services/acpi.te
@@ -27,7 +27,6 @@ type acpid_log_t;
 logging_log_file(acpid_log_t)
 
 type acpid_runtime_t;
-typealias acpid_runtime_t alias acpid_var_run_t;
 files_runtime_file(acpid_runtime_t)
 
 type acpid_tmp_t;

diff --git a/policy/modules/services/clamav.te b/policy/modules/services/clamav.te
index 761de69d..b2ea270c 100644
--- a/policy/modules/services/clamav.te
+++ b/policy/modules/services/clamav.te
@@ -41,7 +41,6 @@ init_script_file(clamd_initrc_exec_t)
 
 type clamd_runtime_t;
 files_runtime_file(clamd_runtime_t)
-typealias clamd_runtime_t alias clamd_var_run_t;
 
 type clamd_tmp_t;
 files_tmp_file(clamd_tmp_t)

diff --git a/policy/modules/services/exim.te b/policy/modules/services/exim.te
index dc03379b..65217d7e 100644
--- a/policy/modules/services/exim.te
+++ b/policy/modules/services/exim.te
@@ -55,7 +55,6 @@ type exim_log_t;
 logging_log_file(exim_log_t)
 
 type exim_pid_t;
-typealias exim_pid_t alias exim_var_run_t;
 files_runtime_file(exim_pid_t)
 
 type exim_spool_t;

diff --git a/policy/modules/services/ftp.te b/policy/modules/services/ftp.te
index 6cffdfc2..a3ff66fe 100644
--- a/policy/modules/services/ftp.te
+++ b/policy/modules/services/ftp.te
@@ -110,7 +110,6 @@ gen_tunable(sftpd_write_ssh_home, false)
 attribute_role ftpdctl_roles;
 
 type anon_sftpd_t;
-typealias anon_sftpd_t alias sftpd_anon_t;
 domain_type(anon_sftpd_t)
 role system_r types anon_sftpd_t;
 

diff --git a/policy/modules/services/irqbalance.te b/policy/modules/services/irqbalance.te
index 3b86f88c..0a6f4c9b 100644
--- a/policy/modules/services/irqbalance.te
+++ b/policy/modules/services/irqbalance.te
@@ -13,7 +13,6 @@ type irqbalance_initrc_exec_t;
 init_script_file(irqbalance_initrc_exec_t)
 
 type irqbalance_pid_t;
-typealias irqbalance_pid_t alias irqbalance_var_run_t;
 files_runtime_file(irqbalance_pid_t)
 
 type irqbalance_unit_t;

diff --git a/policy/modules/services/postfix.te b/policy/modules/services/postfix.te
index 4d62f8cf..6b97df10 100644
--- a/policy/modules/services/postfix.te
+++ b/policy/modules/services/postfix.te
@@ -51,8 +51,7 @@ type postfix_map_tmp_t;
 files_tmp_file(postfix_map_tmp_t)
 
 postfix_domain_template(master)
-typealias postfix_master_t alias postfix_t;
-mta_mailserver(postfix_t, postfix_master_exec_t)
+mta_mailserver(postfix_master_t, postfix_master_exec_t)
 
 type postfix_initrc_exec_t;
 init_script_file(postfix_initrc_exec_t)

diff --git a/policy/modules/services/spamassassin.te b/policy/modules/services/spamassassin.te
index fc4e54f7..4162995f 100644
--- a/policy/modules/services/spamassassin.te
+++ b/policy/modules/services/spamassassin.te
@@ -30,7 +30,6 @@ gen_tunable(spamd_enable_home_dirs, false)
 gen_tunable(rspamd_spamd, false)
 
 type spamd_update_t;
-typealias spamd_update_t alias spamd_gpg_t;
 type spamd_update_exec_t;
 init_system_domain(spamd_update_t, spamd_update_exec_t)
 

diff --git a/policy/modules/system/mount.te b/policy/modules/system/mount.te
index d577da34..0efbdc7f 100644
--- a/policy/modules/system/mount.te
+++ b/policy/modules/system/mount.te
@@ -24,7 +24,6 @@ type mount_loopback_t; # customizable
 fs_image_file(mount_loopback_t)
 
 type mount_runtime_t;
-typealias mount_runtime_t alias mount_var_run_t;
 files_runtime_file(mount_runtime_t)
 
 type mount_tmp_t;

diff --git a/policy/modules/system/selinuxutil.te b/policy/modules/system/selinuxutil.te
index 904c59fc..b596ccb5 100644
--- a/policy/modules/system/selinuxutil.te
+++ b/policy/modules/system/selinuxutil.te
@@ -89,7 +89,6 @@ type restorecond_unit_t;
 init_unit_file(restorecond_unit_t)
 
 type restorecond_run_t;
-typealias restorecond_run_t alias restorecond_var_run_t;
 files_runtime_file(restorecond_run_t)
 
 type run_init_t;

diff --git a/policy/modules/system/systemd.te b/policy/modules/system/systemd.te
index 68fb96ec..d02e7edd 100644
--- a/policy/modules/system/systemd.te
+++ b/policy/modules/system/systemd.te
@@ -111,8 +111,6 @@ systemd_tmpfiles_conf_file(systemd_factory_conf_t)
 
 type systemd_generator_t;
 type systemd_generator_exec_t;
-typealias systemd_generator_t alias { systemd_fstab_generator_t systemd_gpt_generator_t };
-typealias systemd_generator_exec_t alias { systemd_fstab_generator_exec_t systemd_gpt_generator_exec_t };
 init_system_domain(systemd_generator_t, systemd_generator_exec_t)
 
 type systemd_homed_t;