From 013783b2b12891bc44692ac12f0b92fc0fcc19be Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Fri, 16 Nov 2007 15:58:23 +0000
Subject: [PATCH] trunk: switch newrole and run_init over to use nsswitch.

---
 policy/modules/system/selinuxutil.te | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/policy/modules/system/selinuxutil.te b/policy/modules/system/selinuxutil.te
index 03c57569..9c6c69a7 100644
--- a/policy/modules/system/selinuxutil.te
+++ b/policy/modules/system/selinuxutil.te
@@ -1,5 +1,5 @@
 
-policy_module(selinuxutil,1.7.3)
+policy_module(selinuxutil,1.7.4)
 
 gen_require(`
 	bool secure_mode;
@@ -257,6 +257,7 @@ term_relabel_all_user_ptys(newrole_t)
 term_getattr_unallocated_ttys(newrole_t)
 term_dontaudit_use_unallocated_ttys(newrole_t)
 
+auth_use_nsswitch(newrole_t)
 auth_domtrans_chk_passwd(newrole_t)
 auth_rw_faillog(newrole_t)
 
@@ -290,14 +291,6 @@ tunable_policy(`allow_polyinstantiation',`
 	files_polyinstantiate_all(newrole_t)
 ')
 
-optional_policy(`
-	nis_use_ypbind(newrole_t)
-')
-
-optional_policy(`
-	nscd_socket_use(newrole_t)
-')
-
 ########################################
 #
 # Restorecond local policy
@@ -380,6 +373,7 @@ selinux_compute_user_contexts(run_init_t)
 
 term_dontaudit_list_ptys(run_init_t)
 
+auth_use_nsswitch(run_init_t)
 auth_domtrans_chk_passwd(run_init_t)
 auth_dontaudit_read_shadow(run_init_t)
 
@@ -408,10 +402,6 @@ optional_policy(`
 	daemontools_domtrans_start(run_init_t)
 ')
 
-optional_policy(`
-	nscd_socket_use(run_init_t)
-')	
-
 ########################################
 #
 # semodule local policy