X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=policy%2Fmodules%2Fsystem%2Fuserdomain.if;h=db35b2e9b93284ed366bfa5068b010d7eadd63ea;hb=f5fe855dd86a1a5395d174f2e7e1c379595f618d;hp=b7ed01cfa15da4724e77c09176306ca4fbafe39e;hpb=38a93594ee522e7df5b404f6e8e80f5cfeae2edb;p=people%2Fstevee%2Fselinux-policy.git

diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
index b7ed01cf..db35b2e9 100644
--- a/policy/modules/system/userdomain.if
+++ b/policy/modules/system/userdomain.if
@@ -687,10 +687,6 @@ template(`userdom_common_user_template',`
 		canna_stream_connect($1_usertype)
 	')
 
-	optional_policy(`
-		chrome_role($1_r, $1_usertype)
-	')
-
 	optional_policy(`
 		colord_read_lib_files($1_usertype)
 	')
@@ -723,11 +719,6 @@ template(`userdom_common_user_template',`
 			devicekit_dbus_chat_disk($1_usertype)
 		')
 
-		optional_policy(`
-			evolution_dbus_chat($1_usertype)
-			evolution_alarm_dbus_chat($1_usertype)
-		')
-
 		optional_policy(`
 			gnome_dbus_chat_gconfdefault($1_usertype)
 		')
@@ -844,10 +835,6 @@ template(`userdom_common_user_template',`
 	optional_policy(`
 		slrnpull_search_spool($1_usertype)
 	')
-
-	optional_policy(`
-		thumb_role($1_r, $1_usertype)
-	')
 ')
 
 #######################################
@@ -1106,8 +1093,6 @@ template(`userdom_restricted_xwindows_user_template',`
 	 optional_policy(`
 	 	gnome_read_usr_config($1_usertype)
 		gnome_role_gkeyringd($1, $1_r, $1_usertype)
-		# cjp: telepathy F15 bugs
-		telepathy_role($1_r, $1_t, $1)
 	')
 
 	optional_policy(`
@@ -1259,10 +1244,6 @@ template(`userdom_unpriv_user_template', `
 		cron_role($1_r, $1_t)
 	')
 
-	optional_policy(`
-		games_rw_data($1_usertype)
-	')
-
 	optional_policy(`
 		gpg_role($1_r, $1_usertype)
 	')
@@ -3965,6 +3946,38 @@ template(`userdom_unpriv_usertype',`
 	ubac_constrained($2)
 ')
 
+#######################################
+## <summary>
+##  Define this type as a Allow apps to set rlimits on userdomain
+## </summary>
+## <param name="domain">
+##  <summary>
+##  Domain allowed access.
+##  </summary>
+## </param>
+## <param name="userdomain_prefix">
+##  <summary>
+##  The prefix of the user domain (e.g., user
+##  is the prefix for user_t).
+## </summary>
+## </param>
+## <param name="domain">
+##  <summary>
+##  Domain allowed access.
+##  </summary>
+## </param>
+#
+template(`userdom_unpriv_type',`
+    gen_require(`
+        attribute unpriv_userdomain, userdomain;
+    ')
+    typeattribute $2  unpriv_userdomain;
+    typeattribute $2  userdomain;
+
+    auth_use_nsswitch($2)
+    ubac_constrained($2)
+')
+
 ########################################
 ## <summary>
 ##	Connect to users over an unix stream socket.
@@ -5113,4 +5126,3 @@ interface(`userdom_home_manager',`
 
 	typeattribute $1 userdom_home_manager_type;
 ')
-