All of lore.kernel.org
 help / color / mirror / Atom feed
* Remove admin templates from userdom_admin_user_template
@ 2007-04-19 14:09 Daniel J Walsh
  2007-04-26 12:53 ` Christopher J. PeBenito
  0 siblings, 1 reply; 2+ messages in thread
From: Daniel J Walsh @ 2007-04-19 14:09 UTC (permalink / raw)
  To: Christopher J. PeBenito, SE Linux

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: userdomain.patch --]
[-- Type: text/x-patch, Size: 1307 bytes --]

--- 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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Remove admin templates from userdom_admin_user_template
  2007-04-19 14:09 Remove admin templates from userdom_admin_user_template Daniel J Walsh
@ 2007-04-26 12:53 ` Christopher J. PeBenito
  0 siblings, 0 replies; 2+ messages in thread
From: Christopher J. PeBenito @ 2007-04-26 12:53 UTC (permalink / raw)
  To: Daniel J Walsh; +Cc: SE Linux

On Thu, 2007-04-19 at 10:09 -0400, Daniel J Walsh wrote:
> --- 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

The main part has already been done.  Not going to move out the user
definition, as that is what the strict-targeted merge branch is for.

-- 
Chris PeBenito
Tresys Technology, LLC
(410) 290-1411 x150


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-04-26 12:54 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-04-19 14:09 Remove admin templates from userdom_admin_user_template Daniel J Walsh
2007-04-26 12:53 ` Christopher J. PeBenito

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.