From: cpebenito@tresys.com (Christopher J. PeBenito)
Date: Wed, 06 Oct 2010 08:59:33 -0400
Subject: [refpolicy] [ patch 20/44] rpm: (brace) expansion.
In-Reply-To: <1286216636-28449-22-git-send-email-domg472@gmail.com>
References: <1286216636-28449-1-git-send-email-domg472@gmail.com>
	<1286216636-28449-22-git-send-email-domg472@gmail.com>
Message-ID: <4CAC72B5.3000008@tresys.com>
To: refpolicy@oss.tresys.com
List-Id: refpolicy.oss.tresys.com

On 10/04/10 14:23, Dominick Grift wrote:
>
> Signed-off-by: Dominick Grift<domg472@gmail.com>

Merged.

> :100644 100644 9ffe1b2... 56397a4... M	policy/modules/admin/rpm.if
>   policy/modules/admin/rpm.if |    6 ++----
>   1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/policy/modules/admin/rpm.if b/policy/modules/admin/rpm.if
> index 9ffe1b2..56397a4 100644
> --- a/policy/modules/admin/rpm.if
> +++ b/policy/modules/admin/rpm.if
> @@ -31,8 +31,7 @@ interface(`rpm_domtrans',`
>   #
>   interface(`rpm_debuginfo_domtrans',`
>   	gen_require(`
> -		type rpm_t;
> -		type debuginfo_exec_t;
> +		type rpm_t, debuginfo_exec_t;
>   	')
>
>   	corecmd_search_bin($1)
> @@ -83,8 +82,7 @@ interface(`rpm_run',`
>   	')
>
>   	rpm_domtrans($1)
> -	role $2 types rpm_t;
> -	role $2 types rpm_script_t;
> +	role $2 types { rpm_t rpm_script_t };
>   	seutil_run_loadpolicy(rpm_script_t, $2)
>   	seutil_run_semanage(rpm_script_t, $2)
>   	seutil_run_setfiles(rpm_script_t, $2)


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