[selinux-policy: 1827/3172] trunk: fix unconditional call to nscd from usermanage run interfaces.

[Daniel J Walsh]

commit 36627094e85f2d403a943b961e3952d29d5482af
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Mon Oct 15 18:16:00 2007 +0000

    trunk: fix unconditional call to nscd from usermanage run interfaces.

 policy/modules/admin/usermanage.if |   15 ++++++++++++---
 policy/modules/admin/usermanage.te |    2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/policy/modules/admin/usermanage.if b/policy/modules/admin/usermanage.if
index e3300d8..74ccaf9 100644
--- a/policy/modules/admin/usermanage.if
+++ b/policy/modules/admin/usermanage.if
@@ -101,7 +101,10 @@ interface(`usermanage_run_groupadd',`
 	usermanage_domtrans_groupadd($1)
 	role $2 types groupadd_t;
 	allow groupadd_t $3:chr_file rw_term_perms;
-	nscd_run(groupadd_t, $2, $3)
+
+	optional_policy(`
+		nscd_run(groupadd_t, $2, $3)
+	')
 ')
 
 ########################################
@@ -207,7 +210,10 @@ interface(`usermanage_run_admin_passwd',`
 	usermanage_domtrans_admin_passwd($1)
 	role $2 types sysadm_passwd_t;
 	allow sysadm_passwd_t $3:chr_file rw_term_perms;
-	nscd_run(sysadm_passwd_t, $2, $3)
+
+	optional_policy(`
+		nscd_run(sysadm_passwd_t, $2, $3)
+	')
 ')
 
 ########################################
@@ -260,7 +266,10 @@ interface(`usermanage_run_useradd',`
 	usermanage_domtrans_useradd($1)
 	role $2 types useradd_t;
 	allow useradd_t $3:chr_file rw_term_perms;
-	nscd_run(useradd_t, $2, $3)
+
+	optional_policy(`
+		nscd_run(useradd_t, $2, $3)
+	')
 ')
 
 ########################################
diff --git a/policy/modules/admin/usermanage.te b/policy/modules/admin/usermanage.te
index 18e71c8..b57a2cc 100644
--- a/policy/modules/admin/usermanage.te
+++ b/policy/modules/admin/usermanage.te
@@ -1,5 +1,5 @@
 
-policy_module(usermanage,1.8.0)
+policy_module(usermanage,1.8.1)
 
 ########################################
 #