[selinux-policy: 784/3172] simplify since alias take care of it

[Daniel J Walsh]

commit ae1d9afb5bef8ada11d2b019b19903e41573ba00
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Sat Oct 22 20:06:51 2005 +0000

    simplify since alias take care of it

 refpolicy/policy/modules/system/userdomain.if |   62 ++++++------------------
 1 files changed, 16 insertions(+), 46 deletions(-)
---
diff --git a/refpolicy/policy/modules/system/userdomain.if b/refpolicy/policy/modules/system/userdomain.if
index 0f01873..b6284ff 100644
--- a/refpolicy/policy/modules/system/userdomain.if
+++ b/refpolicy/policy/modules/system/userdomain.if
@@ -1815,44 +1815,23 @@ interface(`userdom_dontaudit_list_sysadm_home_dir',`
 ## </param>
 #
 interface(`userdom_create_sysadm_home',`
-	ifdef(`targeted_policy',`
-		gen_require(`
-			type user_home_dir_t, user_home_t;
-		')
+	gen_require(`
+		type sysadm_home_dir_t, sysadm_home_t;
+	')
 
-		allow $1 user_home_dir_t:dir rw_dir_perms;
-		ifelse(`$2',`',`
-			ifelse(`$3',`',`
-				type_transition $1 user_home_dir_t:file user_home_t;
-			',`
-				type_transition $1 user_home_dir_t:$3 user_home_t;
-			')
+	allow $1 sysadm_home_dir_t:dir rw_dir_perms;
+
+	ifelse(`$2',`',`
+		ifelse(`$3',`',`
+			type_transition $1 sysadm_home_dir_t:file sysadm_home_t;
 		',`
-			ifelse(`$3',`',`
-				type_transition $1 user_home_dir_t:file $2;
-			',`
-				type_transition $1 user_home_dir_t:$3 $2;
-			')
+			type_transition $1 sysadm_home_dir_t:$3 sysadm_home_t;
 		')
 	',`
-		gen_require(`
-			type sysadm_home_dir_t, sysadm_home_t;
-		')
-
-		allow $1 sysadm_home_dir_t:dir rw_dir_perms;
-
-		ifelse(`$2',`',`
-			ifelse(`$3',`',`
-				type_transition $1 sysadm_home_dir_t:file sysadm_home_t;
-			',`
-				type_transition $1 sysadm_home_dir_t:$3 sysadm_home_t;
-			')
+		ifelse(`$3',`',`
+			type_transition $1 sysadm_home_dir_t:file $2;
 		',`
-			ifelse(`$3',`',`
-				type_transition $1 sysadm_home_dir_t:file $2;
-			',`
-				type_transition $1 sysadm_home_dir_t:$3 $2;
-			')
+			type_transition $1 sysadm_home_dir_t:$3 $2;
 		')
 	')
 ')
@@ -1866,20 +1845,11 @@ interface(`userdom_create_sysadm_home',`
 ## </param>
 #
 interface(`userdom_search_sysadm_home_subdirs',`
-	ifdef(`targeted_policy',`
-		gen_require(`
-			type user_home_dir_t, user_home_t;
-		')
-
-		allow $1 { user_home_dir_t user_home_t }:dir search_dir_perms;
-
-	',`
-		gen_require(`
-			type sysadm_home_dir_t, sysadm_home_t;
-		')
-
-		allow $1 { sysadm_home_dir_t sysadm_home_t }:dir search_dir_perms;
+	gen_require(`
+		type sysadm_home_dir_t, sysadm_home_t;
 	')
+
+	allow $1 { sysadm_home_dir_t sysadm_home_t }:dir search_dir_perms;
 ')
 
 ########################################