All of lore.kernel.org
 help / color / mirror / Atom feed
From: cpebenito@tresys.com (Christopher J. PeBenito)
To: refpolicy@oss.tresys.com
Subject: [refpolicy] [PATCH v2] Changes to the user domain policy module
Date: Tue, 30 Oct 2012 16:00:07 -0400	[thread overview]
Message-ID: <509031C7.7090902@tresys.com> (raw)
In-Reply-To: <1350910102-30128-1-git-send-email-dominick.grift@gmail.com>

On 10/22/12 08:48, Dominick Grift wrote:
> 
> gnome_role is deprecated, use gnome_role_template instead
> depends on dbus because of gkeyringd

Merged.
 
> Signed-off-by: Dominick Grift <dominick.grift@gmail.com>
> diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te
> index e5aee97..3e7b9ac 100644
> --- a/policy/modules/roles/staff.te
> +++ b/policy/modules/roles/staff.te
> @@ -78,6 +78,10 @@
>  
>  	optional_policy(`
>  		dbus_role_template(staff, staff_r, staff_t)
> +
> +		optional_policy(`
> +			gnome_role_template(staff, staff_r, staff_t)
> +		')
>  	')
>  
>  	optional_policy(`
> @@ -90,10 +94,6 @@
>  
>  	optional_policy(`
>  		gift_role(staff_r, staff_t)
> -	')
> -
> -	optional_policy(`
> -		gnome_role(staff_r, staff_t)
>  	')
>  
>  	optional_policy(`
> diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te
> index 44c198a..1deb197 100644
> --- a/policy/modules/roles/sysadm.te
> +++ b/policy/modules/roles/sysadm.te
> @@ -444,6 +444,10 @@
>  
>  	optional_policy(`
>  		dbus_role_template(sysadm, sysadm_r, sysadm_t)
> +
> +		optional_policy(`
> +			gnome_role_template(sysadm, sysadm_r, sysadm_t)
> +		')
>  	')
>  
>  	optional_policy(`
> @@ -456,10 +460,6 @@
>  
>  	optional_policy(`
>  		gift_role(sysadm_r, sysadm_t)
> -	')
> -
> -	optional_policy(`
> -		gnome_role(sysadm_r, sysadm_t)
>  	')
>  
>  	optional_policy(`
> diff --git a/policy/modules/roles/unprivuser.te b/policy/modules/roles/unprivuser.te
> index 9f6d4c3..2d63b22 100644
> --- a/policy/modules/roles/unprivuser.te
> +++ b/policy/modules/roles/unprivuser.te
> @@ -51,6 +51,10 @@
>  
>  	optional_policy(`
>  		dbus_role_template(user, user_r, user_t)
> +
> +		optional_policy(`
> +			gnome_role_template(user, user_r, user_t)
> +		')
>  	')
>  
>  	optional_policy(`
> @@ -63,10 +67,6 @@
>  
>  	optional_policy(`
>  		gift_role(user_r, user_t)
> -	')
> -
> -	optional_policy(`
> -		gnome_role(user_r, user_t)
>  	')
>  
>  	optional_policy(`
> diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
> index 275bd2b..b487e99 100644
> --- a/policy/modules/system/userdomain.if
> +++ b/policy/modules/system/userdomain.if
> @@ -911,6 +911,10 @@
>  		')
>  
>  		optional_policy(`
> +			gnome_role_template($1, $1_r, $1_t)
> +		')
> +
> +		optional_policy(`
>  			wm_role_template($1, $1_r, $1_t)
>  		')
>  	')

-- 
Chris PeBenito
Tresys Technology, LLC
www.tresys.com | oss.tresys.com

      parent reply	other threads:[~2012-10-30 20:00 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-22 12:48 [refpolicy] [PATCH v2] Changes to the user domain policy module Dominick Grift
2012-10-30 19:25 ` Dominick Grift
2012-10-30 20:00 ` Christopher J. PeBenito [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=509031C7.7090902@tresys.com \
    --to=cpebenito@tresys.com \
    --cc=refpolicy@oss.tresys.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.