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

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

commit:     ded2b53d98e2ce1066bb21aadf87432bf670321b
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Tue Jun  9 13:46:24 2015 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Tue Jun  9 14:36:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=ded2b53d

Remove _admin interfaces from ifdef gentoo section

They are now upstream.

 policy/modules/roles/sysadm.te | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te
index 13b48c6..1963c88 100644
--- a/policy/modules/roles/sysadm.te
+++ b/policy/modules/roles/sysadm.te
@@ -1270,23 +1270,11 @@ ifdef(`distro_gentoo',`
 	')
 
 	optional_policy(`
-		bind_admin(sysadm_t, sysadm_r)
-	')
-
-	optional_policy(`
 		# Bug 529208
 		dmesg_run(sysadm_t, sysadm_r)
 	')
 
 	optional_policy(`
-		dnsmasq_admin(sysadm_t, sysadm_r)
-	')
-
-	optional_policy(`
-		dovecot_admin(sysadm_t, sysadm_r)
-	')
-
-	optional_policy(`
 		dracut_run(sysadm_t, sysadm_r)
 	')
 
@@ -1311,27 +1299,11 @@ ifdef(`distro_gentoo',`
 	')
 
 	optional_policy(`
-		ntp_admin(sysadm_t, sysadm_r)
-	')
-
-	optional_policy(`
-		openvpn_admin(sysadm_t, sysadm_r)
-	')
-
-	optional_policy(`
-		postfix_admin(sysadm_t, sysadm_r)
-	')
-
-	optional_policy(`
 		postgresql_admin(sysadm_t, sysadm_r)
 		postgresql_exec(sysadm_t)
 	')
 
 	optional_policy(`
-		puppet_admin(sysadm_t, sysadm_r)
-	')
-
-	optional_policy(`
 		qemu_read_state(sysadm_t)
 		qemu_signal(sysadm_t)
 		qemu_kill(sysadm_t)
@@ -1340,10 +1312,6 @@ ifdef(`distro_gentoo',`
 	')
 
 	optional_policy(`
-		rpc_admin(sysadm_t, sysadm_r)
-	')
-
-	optional_policy(`
 		rpcbind_stream_connect(sysadm_t)
 	')
 
@@ -1362,10 +1330,6 @@ ifdef(`distro_gentoo',`
 	')
 
 	optional_policy(`
-		shorewall_admin(sysadm_t, sysadm_r)
-	')
-
-	optional_policy(`
 		uwsgi_admin(sysadm_t, sysadm_r)
 	')