[selinux-policy: 1147/3172] add fix for secadm_r. I dont like this, but it can be straightened out later.

[Daniel J Walsh]

commit ba35e4d410e53e771fdce6210ccab352c7f931d8
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Tue Jan 24 22:23:45 2006 +0000

    add fix for secadm_r.  I dont like this, but it can be straightened out later.

 refpolicy/policy/users |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/refpolicy/policy/users b/refpolicy/policy/users
index 45bcb7e..351bd00 100644
--- a/refpolicy/policy/users
+++ b/refpolicy/policy/users
@@ -27,7 +27,7 @@ ifdef(`targeted_policy',`
 gen_user(user_u, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
 ',`
 gen_user(user_u, user_r, s0, s0)
-gen_user(staff_u, staff_r secadm_r sysadm_r, s0, s0 - s15:c0.c255, c0.c255)
+gen_user(staff_u, staff_r sysadm_r ifdef(`enable_mls',`secadm_r'), s0, s0 - s15:c0.c255, c0.c255)
 gen_user(sysadm_u, sysadm_r, s0, s0 - s15:c0.c255, c0.c255)
 ')
 
@@ -42,8 +42,8 @@ ifdef(`targeted_policy',`
 	gen_user(root, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
 ',`
 	ifdef(`direct_sysadm_daemon',`
-		gen_user(root, sysadm_r staff_r secadm_r system_r, s0, s0 - s15:c0.c255, c0.c255)
+		gen_user(root, sysadm_r staff_r ifdef(`enable_mls',`secadm_r') system_r, s0, s0 - s15:c0.c255, c0.c255)
 	',`
-		gen_user(root, sysadm_r staff_r secadm_r , s0, s0 - s15:c0.c255, c0.c255)
+		gen_user(root, sysadm_r staff_r ifdef(`enable_mls',`secadm_r'), s0, s0 - s15:c0.c255, c0.c255)
 	')
 ')