From mboxrd@z Thu Jan  1 00:00:00 1970
From: cpebenito@tresys.com (Christopher J. PeBenito)
Date: Thu, 26 Sep 2013 09:31:23 -0400
Subject: [refpolicy] [PATCH 15/20] userdomain: restricted xwindows user
 (squash me)
In-Reply-To: <1380030009-25462-1-git-send-email-dominick.grift@gmail.com>
References: <1380030009-25462-1-git-send-email-dominick.grift@gmail.com>
Message-ID: <5244372B.9040202@tresys.com>
To: refpolicy@oss.tresys.com
List-Id: refpolicy.oss.tresys.com

On Tue 24 Sep 2013 09:40:09 AM EDT, Dominick Grift wrote:
> Signed-off-by: Dominick Grift <dominick.grift@gmail.com>
> ---
>  policy/modules/system/userdomain.if | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/policy/modules/system/userdomain.if b/policy/modules/system/userdomain.if
> index b4a691d..9dc60c6 100644
> --- a/policy/modules/system/userdomain.if
> +++ b/policy/modules/system/userdomain.if
> @@ -943,9 +943,6 @@ template(`userdom_restricted_xwindows_user_template',`
>
>  		optional_policy(`
>  			gnome_role_template($1, $1_r, $1_t)
> -		')
> -
> -		optional_policy(`
>  			wm_role_template($1, $1_r, $1_t)
>  		')
>  	')

Merged.

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