From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 812CD1381F4 for ; Mon, 13 Aug 2012 19:28:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25C8221C034; Mon, 13 Aug 2012 19:28:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E38DF21C034 for ; Mon, 13 Aug 2012 19:28:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 429751B4019 for ; Mon, 13 Aug 2012 19:28:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 39DF9E543A for ; Mon, 13 Aug 2012 19:28:04 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1344885546.3e2d0c447fb59c0a38f45f68cd27b564915e2acb.SwifT@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/contrib/postfix.fc X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 3e2d0c447fb59c0a38f45f68cd27b564915e2acb X-VCS-Branch: master Date: Mon, 13 Aug 2012 19:28:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0376b992-b306-4f42-b3c1-cfdd7d067053 X-Archives-Hash: 016601d60072a542f304caa9b08f03f1 commit: 3e2d0c447fb59c0a38f45f68cd27b564915e2acb Author: Sven Vermeulen siphos be> AuthorDate: Fri Aug 10 19:07:04 2012 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Mon Aug 13 19:19:06 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=3e2d0c44 Use libexec location for postfix binaries Recent postfix releases have their binaries at /usr/libexec instead of /usr/lib. This patch removes the ifdef for distro_redhat since, even for distributions that would still have the old locations, having the definitions for the contexts loaded doesn't hurt. Add in a small blurb too to reflect the potential deprecation of said contexts. --- policy/modules/contrib/postfix.fc | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/policy/modules/contrib/postfix.fc b/policy/modules/contrib/postfix.fc index 90bf84e..2461792 100644 --- a/policy/modules/contrib/postfix.fc +++ b/policy/modules/contrib/postfix.fc @@ -1,6 +1,5 @@ # postfix /etc/postfix(/.*)? gen_context(system_u:object_r:postfix_etc_t,s0) -ifdef(`distro_redhat', ` /usr/libexec/postfix/.* -- gen_context(system_u:object_r:postfix_exec_t,s0) /usr/libexec/postfix/cleanup -- gen_context(system_u:object_r:postfix_cleanup_exec_t,s0) /usr/libexec/postfix/lmtp -- gen_context(system_u:object_r:postfix_smtp_exec_t,s0) @@ -15,7 +14,6 @@ ifdef(`distro_redhat', ` /usr/libexec/postfix/bounce -- gen_context(system_u:object_r:postfix_bounce_exec_t,s0) /usr/libexec/postfix/pipe -- gen_context(system_u:object_r:postfix_pipe_exec_t,s0) /usr/libexec/postfix/virtual -- gen_context(system_u:object_r:postfix_virtual_exec_t,s0) -', ` /usr/lib/postfix/.* -- gen_context(system_u:object_r:postfix_exec_t,s0) /usr/lib/postfix/cleanup -- gen_context(system_u:object_r:postfix_cleanup_exec_t,s0) /usr/lib/postfix/local -- gen_context(system_u:object_r:postfix_local_exec_t,s0) @@ -29,7 +27,7 @@ ifdef(`distro_redhat', ` /usr/lib/postfix/bounce -- gen_context(system_u:object_r:postfix_bounce_exec_t,s0) /usr/lib/postfix/pipe -- gen_context(system_u:object_r:postfix_pipe_exec_t,s0) /usr/lib/postfix/virtual -- gen_context(system_u:object_r:postfix_virtual_exec_t,s0) -') + /etc/postfix/postfix-script.* -- gen_context(system_u:object_r:postfix_exec_t,s0) /etc/postfix/prng_exch -- gen_context(system_u:object_r:postfix_prng_t,s0) /usr/sbin/postcat -- gen_context(system_u:object_r:postfix_master_exec_t,s0)