[selinux-policy: 985/3172] tweaks from dan

[Daniel J Walsh]

commit 9cc2ccc4ed5f828056f3609598435d54332b1817
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Tue Nov 22 17:56:53 2005 +0000

    tweaks from dan

 refpolicy/Changelog                           |    3 +--
 refpolicy/Makefile                            |    3 ---
 refpolicy/policy/modules/system/userdomain.if |   12 ++++++++----
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/refpolicy/Changelog b/refpolicy/Changelog
index 38b36c6..17fc6e6 100644
--- a/refpolicy/Changelog
+++ b/refpolicy/Changelog
@@ -1,7 +1,6 @@
-- Fixes from Dan Walsh for ldap and authlogin.
+- Miscellaneous fixes from Dan Walsh.
 - Fix corenetwork gen_context()'s to expand during the policy
   build phase instead of during the generation phase.  
-- DISTRO=redhat now implies DIRECT_INITRC=y.
 - Added policies:
 	amanda
 	avahi
diff --git a/refpolicy/Makefile b/refpolicy/Makefile
index d814771..ec55b76 100644
--- a/refpolicy/Makefile
+++ b/refpolicy/Makefile
@@ -142,9 +142,6 @@ endif
 # enable distribution-specific policy
 ifneq ($(DISTRO),)
 	override M4PARAM += -D distro_$(DISTRO)
-ifeq ($(DISTRO),redhat)
-	override DIRECT_INITRC := y
-endif
 endif
 
 ifneq ($(OUTPUT_POLICY),)
diff --git a/refpolicy/policy/modules/system/userdomain.if b/refpolicy/policy/modules/system/userdomain.if
index 615afb0..d0cd834 100644
--- a/refpolicy/policy/modules/system/userdomain.if
+++ b/refpolicy/policy/modules/system/userdomain.if
@@ -2465,11 +2465,15 @@ interface(`userdom_write_unpriv_user_tmp',`
 ## </param>
 #
 interface(`userdom_dontaudit_use_unpriv_user_tty',`
-	gen_require(`
-		attribute user_ttynode;
-	')
+	ifdef(`targeted_policy',`
+		term_dontaudit_use_generic_pty($1)
+	',`
+		gen_require(`
+			attribute user_ttynode;
+		')
 
-	dontaudit $1 user_ttynode:chr_file rw_file_perms;
+		dontaudit $1 user_ttynode:chr_file rw_file_perms;
+	')
 ')
 
 ########################################