selinux-refpolicy.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] remove aliases from 20210203
@ 2022-02-13 10:10 Russell Coker
  2022-02-16 11:54 ` Chris PeBenito
  0 siblings, 1 reply; 2+ messages in thread
From: Russell Coker @ 2022-02-13 10:10 UTC (permalink / raw)
  To: selinux-refpolicy

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@coker.com.au>

Index: refpolicy-2.20220106/policy/modules/services/acpi.te
===================================================================
--- refpolicy-2.20220106.orig/policy/modules/services/acpi.te
+++ refpolicy-2.20220106/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;
Index: refpolicy-2.20220106/policy/modules/services/clamav.te
===================================================================
--- refpolicy-2.20220106.orig/policy/modules/services/clamav.te
+++ refpolicy-2.20220106/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)
Index: refpolicy-2.20220106/policy/modules/services/exim.te
===================================================================
--- refpolicy-2.20220106.orig/policy/modules/services/exim.te
+++ refpolicy-2.20220106/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;
Index: refpolicy-2.20220106/policy/modules/services/ftp.te
===================================================================
--- refpolicy-2.20220106.orig/policy/modules/services/ftp.te
+++ refpolicy-2.20220106/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;
 
Index: refpolicy-2.20220106/policy/modules/services/irqbalance.te
===================================================================
--- refpolicy-2.20220106.orig/policy/modules/services/irqbalance.te
+++ refpolicy-2.20220106/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;
Index: refpolicy-2.20220106/policy/modules/services/postfix.te
===================================================================
--- refpolicy-2.20220106.orig/policy/modules/services/postfix.te
+++ refpolicy-2.20220106/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)
Index: refpolicy-2.20220106/policy/modules/services/spamassassin.te
===================================================================
--- refpolicy-2.20220106.orig/policy/modules/services/spamassassin.te
+++ refpolicy-2.20220106/policy/modules/services/spamassassin.te
@@ -30,7 +30,6 @@ gen_tunable(spamd_enable_home_dirs, fals
 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)
 
Index: refpolicy-2.20220106/policy/modules/system/mount.te
===================================================================
--- refpolicy-2.20220106.orig/policy/modules/system/mount.te
+++ refpolicy-2.20220106/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;
Index: refpolicy-2.20220106/policy/modules/system/selinuxutil.te
===================================================================
--- refpolicy-2.20220106.orig/policy/modules/system/selinuxutil.te
+++ refpolicy-2.20220106/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;
Index: refpolicy-2.20220106/policy/modules/system/systemd.te
===================================================================
--- refpolicy-2.20220106.orig/policy/modules/system/systemd.te
+++ refpolicy-2.20220106/policy/modules/system/systemd.te
@@ -107,8 +107,6 @@ systemd_tmpfiles_conf_file(systemd_facto
 
 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_hostnamed_t;

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] remove aliases from 20210203
  2022-02-13 10:10 [PATCH] remove aliases from 20210203 Russell Coker
@ 2022-02-16 11:54 ` Chris PeBenito
  0 siblings, 0 replies; 2+ messages in thread
From: Chris PeBenito @ 2022-02-16 11:54 UTC (permalink / raw)
  To: Russell Coker, selinux-refpolicy

On 2/13/22 05:10, Russell Coker wrote:
> 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.

Merged.


> Signed-off-by: Russell Coker <russell@coker.com.au>
> 
> Index: refpolicy-2.20220106/policy/modules/services/acpi.te
> ===================================================================
> --- refpolicy-2.20220106.orig/policy/modules/services/acpi.te
> +++ refpolicy-2.20220106/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;
> Index: refpolicy-2.20220106/policy/modules/services/clamav.te
> ===================================================================
> --- refpolicy-2.20220106.orig/policy/modules/services/clamav.te
> +++ refpolicy-2.20220106/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)
> Index: refpolicy-2.20220106/policy/modules/services/exim.te
> ===================================================================
> --- refpolicy-2.20220106.orig/policy/modules/services/exim.te
> +++ refpolicy-2.20220106/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;
> Index: refpolicy-2.20220106/policy/modules/services/ftp.te
> ===================================================================
> --- refpolicy-2.20220106.orig/policy/modules/services/ftp.te
> +++ refpolicy-2.20220106/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;
>   
> Index: refpolicy-2.20220106/policy/modules/services/irqbalance.te
> ===================================================================
> --- refpolicy-2.20220106.orig/policy/modules/services/irqbalance.te
> +++ refpolicy-2.20220106/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;
> Index: refpolicy-2.20220106/policy/modules/services/postfix.te
> ===================================================================
> --- refpolicy-2.20220106.orig/policy/modules/services/postfix.te
> +++ refpolicy-2.20220106/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)
> Index: refpolicy-2.20220106/policy/modules/services/spamassassin.te
> ===================================================================
> --- refpolicy-2.20220106.orig/policy/modules/services/spamassassin.te
> +++ refpolicy-2.20220106/policy/modules/services/spamassassin.te
> @@ -30,7 +30,6 @@ gen_tunable(spamd_enable_home_dirs, fals
>   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)
>   
> Index: refpolicy-2.20220106/policy/modules/system/mount.te
> ===================================================================
> --- refpolicy-2.20220106.orig/policy/modules/system/mount.te
> +++ refpolicy-2.20220106/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;
> Index: refpolicy-2.20220106/policy/modules/system/selinuxutil.te
> ===================================================================
> --- refpolicy-2.20220106.orig/policy/modules/system/selinuxutil.te
> +++ refpolicy-2.20220106/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;
> Index: refpolicy-2.20220106/policy/modules/system/systemd.te
> ===================================================================
> --- refpolicy-2.20220106.orig/policy/modules/system/systemd.te
> +++ refpolicy-2.20220106/policy/modules/system/systemd.te
> @@ -107,8 +107,6 @@ systemd_tmpfiles_conf_file(systemd_facto
>   
>   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_hostnamed_t;


-- 
Chris PeBenito

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-02-16 11:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-13 10:10 [PATCH] remove aliases from 20210203 Russell Coker
2022-02-16 11:54 ` Chris PeBenito

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).