From: jwcart2@tycho.nsa.gov (James Carter) Date: Wed, 11 Apr 2018 14:57:04 -0400 Subject: [refpolicy] [PATCH 10/13] Fix typos in identifier names Message-ID: <20180411185704.23666-1-jwcart2@tycho.nsa.gov> To: refpolicy@oss.tresys.com List-Id: refpolicy.oss.tresys.com The interfaces djbdns_link_tinydns_keys(), firewalld_admin(), tftp_etc_filetrans_config(), and wm_write_pipes() were always being removed because of unmet requires. In djbdns.if:djbdns_link_tinydns_keys() djbdns_tinydn_t should be djbdns_tinydns_t Called in contrib/cron.te In firewald.if:firewalld_admin() firewall_etc_rw_t should be firewalld_etc_rw_t Called in roles/sysadm.te In ftp.te: tcpd_t should be ftpd_t In tftp.if:tftp_etc_filetrans_config() tftp_conf_t should be tftpd_conf_t Called in contrib/cobbler.te In wm.if:wm_write_pipes() $_t should be $1_wm_t Called in wm_role_template() which is called in roles/unprivuser.te, roles/sysadm.te, and roles/staff.te. wm_role_template is also called in system/userdomain.if:userdom_restricted_xwindows_user_template() which is called in contrib/xguest.te. Signed-off-by: James Carter --- djbdns.if | 4 ++-- firewalld.if | 4 ++-- ftp.te | 2 +- tftp.if | 4 ++-- wm.if | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/djbdns.if b/djbdns.if index 671d3c0..dd87a12 100644 --- a/djbdns.if +++ b/djbdns.if @@ -71,8 +71,8 @@ interface(`djbdns_search_tinydns_keys',` # interface(`djbdns_link_tinydns_keys',` gen_require(` - type djbdns_tinydn_t; + type djbdns_tinydns_t; ') - allow $1 djbdns_tinydn_t:key link; + allow $1 djbdns_tinydns_t:key link; ') diff --git a/firewalld.if b/firewalld.if index d5f8669..b4fda82 100644 --- a/firewalld.if +++ b/firewalld.if @@ -98,7 +98,7 @@ interface(`firewalld_read_var_run_files',` interface(`firewalld_admin',` gen_require(` type firewalld_t, firewalld_initrc_exec_t; - type firewall_etc_rw_t, firewalld_var_run_t; + type firewalld_etc_rw_t, firewalld_var_run_t; type firewalld_var_log_t; ') @@ -114,5 +114,5 @@ interface(`firewalld_admin',` admin_pattern($1, firewalld_var_log_t) files_search_etc($1) - admin_pattern($1, firewall_etc_rw_t) + admin_pattern($1, firewalld_etc_rw_t) ') diff --git a/ftp.te b/ftp.te index 0a5465a..a711bfb 100644 --- a/ftp.te +++ b/ftp.te @@ -394,7 +394,7 @@ optional_policy(` inetd_tcp_service_domain(ftpd_t, ftpd_exec_t) optional_policy(` - tcpd_domtrans(tcpd_t) + tcpd_domtrans(ftpd_t) ') ') diff --git a/tftp.if b/tftp.if index dae82eb..b32fa3c 100644 --- a/tftp.if +++ b/tftp.if @@ -105,10 +105,10 @@ interface(`tftp_manage_config_files',` # interface(`tftp_etc_filetrans_config',` gen_require(` - type tftp_conf_t; + type tftpd_conf_t; ') - files_etc_filetrans($1, tftp_conf_t, $2, $3) + files_etc_filetrans($1, tftpd_conf_t, $2, $3) ') ######################################## diff --git a/wm.if b/wm.if index bb0d3ea..260a7b0 100644 --- a/wm.if +++ b/wm.if @@ -245,7 +245,7 @@ interface(`wm_application_domain',` # interface(`wm_write_pipes',` gen_require(` - type $1_t; + type $1_wm_t; ') allow $2 $1_wm_t:fifo_file write; -- 2.13.6