[gentoo-commits] proj/hardened-refpolicy:swift commit in: policy/modules/contrib/

["Sven Vermeulen" <swift@gentoo.org>]

commit:     049db179d5652a69cc90ee89fec2a6d6f2899f95
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Mon Jun  8 19:14:24 2015 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 13:06:31 2015 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=049db179

Remove _run() interfaces from _admin()

Both cannot be applied to a type so removing _run from _admin
means things are a lot more flexible.

 policy/modules/contrib/bacula.if  | 2 --
 policy/modules/contrib/bind.if    | 2 --
 policy/modules/contrib/kudzu.if   | 2 --
 policy/modules/contrib/portmap.if | 2 --
 policy/modules/contrib/quota.if   | 2 --
 policy/modules/contrib/raid.if    | 2 --
 policy/modules/contrib/rpm.if     | 2 --
 policy/modules/contrib/samba.if   | 5 -----
 8 files changed, 19 deletions(-)

diff --git a/policy/modules/contrib/bacula.if b/policy/modules/contrib/bacula.if
index 18ad480..eba3f1c 100644
--- a/policy/modules/contrib/bacula.if
+++ b/policy/modules/contrib/bacula.if
@@ -90,6 +90,4 @@ interface(`bacula_admin',`
 
 	files_search_pids($1)
 	admin_pattern($1, bacula_var_run_t)
-
-	bacula_run_admin($1, $2)
 ')

diff --git a/policy/modules/contrib/bind.if b/policy/modules/contrib/bind.if
index 9654435..1e974ca 100644
--- a/policy/modules/contrib/bind.if
+++ b/policy/modules/contrib/bind.if
@@ -386,6 +386,4 @@ interface(`bind_admin',`
 
 	files_list_pids($1)
 	admin_pattern($1, named_var_run_t)
-
-	bind_run_ndc($1, $2)
 ')

diff --git a/policy/modules/contrib/kudzu.if b/policy/modules/contrib/kudzu.if
index 993e152..85214c5 100644
--- a/policy/modules/contrib/kudzu.if
+++ b/policy/modules/contrib/kudzu.if
@@ -96,6 +96,4 @@ interface(`kudzu_admin',`
 
 	files_search_pids($1)
 	admin_pattern($1, kudzu_var_run_t)
-
-	kudzu_run($1, $2)
 ')

diff --git a/policy/modules/contrib/portmap.if b/policy/modules/contrib/portmap.if
index 61e1a12..f0af3fe 100644
--- a/policy/modules/contrib/portmap.if
+++ b/policy/modules/contrib/portmap.if
@@ -121,6 +121,4 @@ interface(`portmap_admin',`
 
 	files_search_tmp($1)
 	admin_pattern($1, portmap_tmp_t)
-
-	portmap_run_helper($1, $2)
 ')

diff --git a/policy/modules/contrib/quota.if b/policy/modules/contrib/quota.if
index c2a5ef4..6f8a925 100644
--- a/policy/modules/contrib/quota.if
+++ b/policy/modules/contrib/quota.if
@@ -188,6 +188,4 @@ interface(`quota_admin',`
 
 	files_list_all($1)
 	admin_pattern($1, { quota_db_t quota_flag_t quota_nld_var_run_t })
-
-	quota_run($1, $2)
 ')

diff --git a/policy/modules/contrib/raid.if b/policy/modules/contrib/raid.if
index 6d98a94..091c805 100644
--- a/policy/modules/contrib/raid.if
+++ b/policy/modules/contrib/raid.if
@@ -95,6 +95,4 @@ interface(`raid_admin_mdadm',`
 
 	files_search_pids($1)
 	admin_pattern($1, mdadm_var_run_t)
-
-	raid_run_mdadm($2, $1)
 ')

diff --git a/policy/modules/contrib/rpm.if b/policy/modules/contrib/rpm.if
index 3ff41b3..2344edd 100644
--- a/policy/modules/contrib/rpm.if
+++ b/policy/modules/contrib/rpm.if
@@ -658,6 +658,4 @@ interface(`rpm_admin',`
 
 	fs_search_tmpfs($1)
 	admin_pattern($1, { rpm_tmpfs_t rpm_script_tmpfs_t })
-
-	rpm_run($1, $2)
 ')

diff --git a/policy/modules/contrib/samba.if b/policy/modules/contrib/samba.if
index dfc606e..f30e31d 100644
--- a/policy/modules/contrib/samba.if
+++ b/policy/modules/contrib/samba.if
@@ -714,9 +714,4 @@ interface(`samba_admin',`
 
 	files_list_tmp($1)
 	admin_pattern($1, { swat_tmp_t smbd_tmp_t winbind_tmp_t })
-
-	samba_run_smbcontrol($1, $2)
-	samba_run_winbind_helper($1, $2)
-	samba_run_smbmount($1, $2)
-	samba_run_net($1, $2)
 ')