From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-752296-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0506D1389E2 for <garchives@archives.gentoo.org>; Wed, 3 Dec 2014 12:55:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A597EE08D6; Wed, 3 Dec 2014 12:55:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B43DE08BD for <gentoo-commits@lists.gentoo.org>; Wed, 3 Dec 2014 12:54:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1AEFF3405DB for <gentoo-commits@lists.gentoo.org>; Wed, 3 Dec 2014 12:54:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A939B749 for <gentoo-commits@lists.gentoo.org>; Wed, 3 Dec 2014 12:54:54 +0000 (UTC) From: "Jason Zaman" <gentoo@perfinion.com> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" <gentoo@perfinion.com> Message-ID: <1417596213.b6fc3fcdd166ae3851c52e32a1f8f50c4b4d047e.perfinion@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/pyzor.if X-VCS-Directories: policy/modules/contrib/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: b6fc3fcdd166ae3851c52e32a1f8f50c4b4d047e X-VCS-Branch: master Date: Wed, 3 Dec 2014 12:54:54 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 28a1eaf1-ec29-49dc-a8bf-b91994b49ac7 X-Archives-Hash: 3dae91b66addea8b35c84c7d71ce84da Message-ID: <20141203125454.c-GeQI230REZmht8EXqzdAZ9Hx0vaPBt6tNeO-DA6qk@z> commit: b6fc3fcdd166ae3851c52e32a1f8f50c4b4d047e Author: Jason Zaman <jason <AT> perfinion <DOT> com> AuthorDate: Wed Nov 26 06:39:15 2014 +0000 Commit: Jason Zaman <gentoo <AT> perfinion <DOT> com> CommitDate: Wed Dec 3 08:43:33 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=b6fc3fcd remove pyzor_role() from pyzor_admin() pyzor_role contains some named filetrans's which can not be applied twice. The roles already contain pyzor_role which makes adding pyzor_admin impossible. This removes the role so they can both be applied. --- policy/modules/contrib/pyzor.if | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/policy/modules/contrib/pyzor.if b/policy/modules/contrib/pyzor.if index 593c03d..c05a504 100644 --- a/policy/modules/contrib/pyzor.if +++ b/policy/modules/contrib/pyzor.if @@ -132,5 +132,6 @@ interface(`pyzor_admin',` files_search_var_lib($1) admin_pattern($1, pyzor_var_lib_t) - pyzor_role($2, $1) + # This makes it impossible to apply _admin if _role has already been applied + #pyzor_role($2, $1) ')