[selinux-policy: 387/3172] misc cleanup

[Daniel J Walsh]

commit 0e721690dc0a112500337388bbaed25a6ce468c9
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Thu Jun 16 20:54:18 2005 +0000

    misc cleanup

 refpolicy/policy/modules/kernel/terminal.if  |   22 ++++++++--------------
 refpolicy/policy/modules/system/authlogin.if |   10 ++++------
 2 files changed, 12 insertions(+), 20 deletions(-)
---
diff --git a/refpolicy/policy/modules/kernel/terminal.if b/refpolicy/policy/modules/kernel/terminal.if
index cb592ea..27256fb 100644
--- a/refpolicy/policy/modules/kernel/terminal.if
+++ b/refpolicy/policy/modules/kernel/terminal.if
@@ -325,17 +325,14 @@ define(`term_use_generic_pty_depend',`
 ## </interface>
 #
 define(`term_dontaudit_use_generic_pty',`
-	gen_require(`$0'_depend)
+	gen_require(`
+		type devpts_t;
+		class chr_file { read write };
+	')
 
 	dontaudit $1 devpts_t:chr_file { read write };
 ')
 
-define(`term_dontaudit_use_generic_pty_depend',`
-	type devpts_t;
-
-	class chr_file { read write };
-')
-
 ########################################
 ## <interface name="term_use_controlling_term">
 ##	<description>
@@ -348,18 +345,15 @@ define(`term_dontaudit_use_generic_pty_depend',`
 ## </interface>
 #
 define(`term_use_controlling_term',`
-	gen_require(`$0'_depend)
+	gen_require(`
+		type devtty_t;
+		class chr_file { getattr read write ioctl };
+	')
 
 	dev_list_all_dev_nodes($1)
 	allow $1 devtty_t:chr_file { getattr read write ioctl };
 ')
 
-define(`term_use_controlling_terminal_depend',`
-	type devtty_t;
-
-	class chr_file { getattr read write ioctl };
-')
-
 ########################################
 ## <interface name="term_dontaudit_use_ptmx">
 ##	<description>
diff --git a/refpolicy/policy/modules/system/authlogin.if b/refpolicy/policy/modules/system/authlogin.if
index ab48c10..42fe7ee 100644
--- a/refpolicy/policy/modules/system/authlogin.if
+++ b/refpolicy/policy/modules/system/authlogin.if
@@ -837,15 +837,13 @@ define(`auth_read_login_records_depend',`
 # auth_rw_login_records(domain)
 #
 define(`auth_rw_login_records',`
-	gen_require(`$0'_depend)
+	gen_require(`
+		type wtmp_t;
+		class file rw_file_perms;
+	')
 
 	allow $1 wtmp_t:file rw_file_perms;
 	logging_search_logs($1)
 ')
 
-define(`auth_rw_login_records_depend',`
-type wtmp_t;
-class file rw_file_perms;
-')
-
 ## </module>