From abc89340c42ebfa295e48e92f14a9b4a3dc1a482 Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Thu, 6 Sep 2007 19:29:54 +0000
Subject: [PATCH] trunk: two tiny patches from Stefan Schulze Frielinghaus

---
 policy/modules/kernel/terminal.if    | 19 +++++++++++++++++++
 policy/modules/kernel/terminal.te    |  2 +-
 policy/modules/system/selinuxutil.te |  8 +++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/policy/modules/kernel/terminal.if b/policy/modules/kernel/terminal.if
index 4406a429..b7021566 100644
--- a/policy/modules/kernel/terminal.if
+++ b/policy/modules/kernel/terminal.if
@@ -692,6 +692,25 @@ interface(`term_relabelto_all_user_ptys',`
 	allow $1 ptynode:chr_file relabelto;
 ')
 
+########################################
+## <summary>
+##	Write to all user ptys.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`term_write_all_user_ptys',`
+	gen_require(`
+		attribute ptynode;
+	')
+
+	dev_list_all_dev_nodes($1)
+	allow $1 ptynode:chr_file write_chr_file_perms;
+')
+
 ########################################
 ## <summary>
 ##	Read and write all user ptys.
diff --git a/policy/modules/kernel/terminal.te b/policy/modules/kernel/terminal.te
index 695ad346..3717b9f4 100644
--- a/policy/modules/kernel/terminal.te
+++ b/policy/modules/kernel/terminal.te
@@ -1,5 +1,5 @@
 
-policy_module(terminal,1.5.0)
+policy_module(terminal,1.5.1)
 
 ########################################
 #
diff --git a/policy/modules/system/selinuxutil.te b/policy/modules/system/selinuxutil.te
index 28f757df..da70bdee 100644
--- a/policy/modules/system/selinuxutil.te
+++ b/policy/modules/system/selinuxutil.te
@@ -1,5 +1,5 @@
 
-policy_module(selinuxutil,1.6.2)
+policy_module(selinuxutil,1.6.3)
 
 ifdef(`strict_policy',`
 	gen_require(`
@@ -477,6 +477,7 @@ mls_file_read_all_levels(semanage_t)
 
 selinux_validate_context(semanage_t)
 selinux_get_enforce_mode(semanage_t)
+selinux_getattr_fs(semanage_t)
 # for setsebool:
 selinux_set_boolean(semanage_t)
 
@@ -510,6 +511,11 @@ seutil_manage_default_contexts(semanage_t)
 
 userdom_search_sysadm_home_dirs(semanage_t)
 
+ifdef(`distro_debian',`
+	files_read_var_lib_files(semanage_t)
+	files_read_var_lib_symlinks(semanage_t)
+')
+
 # cjp: need a more general way to handle this:
 ifdef(`enable_mls',`
 	# read secadm tmp files