From: cpebenito@tresys.com (Christopher J. PeBenito)
Date: Tue, 22 Mar 2011 08:48:20 -0400
Subject: [refpolicy] [PATCH 04/15] Fix file contexts,
 add Gentoo-specific (?) location
In-Reply-To: <20110309210901.GA4675@siphos.be>
References: <20110309210901.GA4675@siphos.be>
Message-ID: <4D889A94.4070602@tresys.com>
To: refpolicy@oss.tresys.com
List-Id: refpolicy.oss.tresys.com

On 03/09/11 16:09, Sven Vermeulen wrote:
> Update on the file contexts for courier-imap. Also fixes a few context 
> directives which didn't update the directory itself.

Merged.

> Signed-off-by: Sven Vermeulen <sven.vermeulen@siphos.be>
> ---
>  policy/modules/services/courier.fc |   10 ++++++----
>  1 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/policy/modules/services/courier.fc b/policy/modules/services/courier.fc
> index f1bf79a..e1bfcca 100644
> --- a/policy/modules/services/courier.fc
> +++ b/policy/modules/services/courier.fc
> @@ -5,8 +5,10 @@
>  /usr/sbin/courierlogger			--	gen_context(system_u:object_r:courier_exec_t,s0)
>  /usr/sbin/courierldapaliasd		--	gen_context(system_u:object_r:courier_exec_t,s0)
>  /usr/sbin/couriertcpd			--	gen_context(system_u:object_r:courier_tcpd_exec_t,s0)
> -
> -/usr/lib(64)?/courier/authlib/.*	--	gen_context(system_u:object_r:courier_authdaemon_exec_t,s0)
> +ifdef(`distro_gentoo',`
> +/usr/lib(64)?/courier-imap/couriertcpd	--	gen_context(system_u:object_r:courier_tcpd_exec_t,s0)
> +')
> +/usr/lib(64)?/courier/(courier-)?authlib/.*	--	gen_context(system_u:object_r:courier_authdaemon_exec_t,s0)
>  /usr/lib(64)?/courier/courier/.*	--	gen_context(system_u:object_r:courier_exec_t,s0)
>  /usr/lib(64)?/courier/courier/courierpop.* --	gen_context(system_u:object_r:courier_pop_exec_t,s0)
>  /usr/lib(64)?/courier/courier/imaplogin --	gen_context(system_u:object_r:courier_pop_exec_t,s0)
> @@ -16,9 +18,9 @@
>  /usr/lib(64)?/courier/rootcerts(/.*)?		gen_context(system_u:object_r:courier_etc_t,s0)
>  /usr/lib(64)?/courier/sqwebmail/cleancache\.pl -- gen_context(system_u:object_r:sqwebmail_cron_exec_t,s0)
>  
> -/var/lib/courier(/.*)?			--	gen_context(system_u:object_r:courier_var_lib_t,s0)
> +/var/lib/courier(/.*)?				gen_context(system_u:object_r:courier_var_lib_t,s0)
>  
> -/var/run/courier(/.*)?			--	gen_context(system_u:object_r:courier_var_run_t,s0)
> +/var/run/courier(/.*)?				gen_context(system_u:object_r:courier_var_run_t,s0)
>  
>  /var/spool/authdaemon(/.*)?			gen_context(system_u:object_r:courier_spool_t,s0)
>  /var/spool/courier(/.*)?			gen_context(system_u:object_r:courier_spool_t,s0)


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