From 563e58e863870c1e71538fd1e71a02985aadb403 Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Wed, 29 Nov 2006 13:44:40 +0000
Subject: [PATCH] patch from dan for some missing gen_require()s

---
 policy/modules/apps/mozilla.if      | 5 ++++-
 policy/modules/services/xserver.if  | 8 ++++++++
 policy/modules/system/userdomain.if | 9 +++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/policy/modules/apps/mozilla.if b/policy/modules/apps/mozilla.if
index 06b220f6..6f6f6a45 100644
--- a/policy/modules/apps/mozilla.if
+++ b/policy/modules/apps/mozilla.if
@@ -33,7 +33,10 @@
 ## </param>
 #
 template(`mozilla_per_role_template',`
-	
+	gen_require(`
+		type mozilla_conf_t, mozilla_exec_t;
+	')
+
 	########################################
 	#
 	# Declarations
diff --git a/policy/modules/services/xserver.if b/policy/modules/services/xserver.if
index db6a010c..f5c79d67 100644
--- a/policy/modules/services/xserver.if
+++ b/policy/modules/services/xserver.if
@@ -13,6 +13,9 @@
 ## </param>
 #
 template(`xserver_common_domain_template',`
+	gen_require(`
+		type xkb_var_lib_t, xserver_exec_t, xserver_log_t;
+	')
 
 	##############################
 	#
@@ -222,6 +225,11 @@ template(`xserver_common_domain_template',`
 #
 template(`xserver_per_role_template',`
 
+	gen_require(`
+		type iceauth_exec_t, xauth_exec_t;
+		attribute fonts_type, fonts_cache_type, fonts_config_type;
+	')
+
 	##############################
 	#
 	# Declarations
diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
index c47a891b..96002f05 100644
--- a/policy/modules/system/userdomain.if
+++ b/policy/modules/system/userdomain.if
@@ -639,6 +639,9 @@ template(`userdom_role_change_template',`
 ## </param>
 #
 template(`userdom_common_user_template',`
+	gen_require(`
+		attribute unpriv_userdomain;
+	')
 
 	userdom_base_user_template($1)
 
@@ -899,6 +902,11 @@ template(`userdom_common_user_template',`
 ## </param>
 #
 template(`userdom_unpriv_user_template', `
+
+	gen_require(`
+		attribute privhome, user_ptynode, user_home_dir_type, user_home_type, user_tmpfile, user_ttynode;
+	')
+
 	##############################
 	#
 	# Declarations
@@ -1033,6 +1041,7 @@ template(`userdom_unpriv_user_template', `
 #
 template(`userdom_admin_user_template',`
 	gen_require(`
+		attribute admin_terminal, privhome;
 		class passwd { passwd chfn chsh rootok crontab };
 	')