--- nsaserefpolicy/policy/modules/system/userdomain.if	2007-03-26 16:24:13.000000000 -0400
+++ serefpolicy-2.5.12/policy/modules/system/userdomain.if	2007-04-19 09:43:55.000000000 -0400
@@ -1225,22 +1230,6 @@
 	')
 
 	optional_policy(`
-		cron_admin_template($1,$1_t,$1_r)
-	')
-
-	optional_policy(`
-		ethereal_admin_template($1,$1_t,$1_r)
-	')
-
-	optional_policy(`
-		lpr_admin_template($1,$1_t,$1_r)
-	')
-
-	optional_policy(`
-		mta_admin_template($1,$1_t,$1_r)
-	')
-
-	optional_policy(`
 		userhelper_exec($1_t)
 	')
 ')
--- nsaserefpolicy/policy/modules/system/userdomain.te	2007-03-26 16:24:13.000000000 -0400
+++ serefpolicy-2.5.12/policy/modules/system/userdomain.te	2007-04-19 09:48:39.000000000 -0400
@@ -101,10 +102,27 @@
 # Local policy
 #
 
+userdom_unpriv_user_template(user)
 ifdef(`strict_policy',`
 	userdom_admin_user_template(sysadm)
+
+	optional_policy(`
+		cron_admin_template(sysadm,sysadm_t,sysadm_r)
+	')
+
+	optional_policy(`
+		ethereal_admin_template(sysadm,sysadm_t,sysadm_r)
+	')
+
+	optional_policy(`
+		lpr_admin_template(sysadm,sysadm_t,sysadm_r)
+	')
+
+	optional_policy(`
+		mta_admin_template(sysadm,sysadm_t,sysadm_r)
+	')
+
 	userdom_unpriv_user_template(staff)
-	userdom_unpriv_user_template(user)
 
 	# user role change rules:
 	# sysadm_r can change to user roles