Gentoo Archives: gentoo-commits

From: Jason Zaman <gentoo@×××××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-refpolicy:adminroles commit in: policy/modules/contrib/
Date: Wed, 03 Dec 2014 12:56:43
Message-Id: 1417596213.b6fc3fcdd166ae3851c52e32a1f8f50c4b4d047e.perfinion@gentoo
1 commit: b6fc3fcdd166ae3851c52e32a1f8f50c4b4d047e
2 Author: Jason Zaman <jason <AT> perfinion <DOT> com>
3 AuthorDate: Wed Nov 26 06:39:15 2014 +0000
4 Commit: Jason Zaman <gentoo <AT> perfinion <DOT> com>
5 CommitDate: Wed Dec 3 08:43:33 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=b6fc3fcd
7
8 remove pyzor_role() from pyzor_admin()
9
10 pyzor_role contains some named filetrans's which can not be applied
11 twice. The roles already contain pyzor_role which makes adding
12 pyzor_admin impossible. This removes the role so they can both be
13 applied.
14
15 ---
16 policy/modules/contrib/pyzor.if | 3 ++-
17 1 file changed, 2 insertions(+), 1 deletion(-)
18
19 diff --git a/policy/modules/contrib/pyzor.if b/policy/modules/contrib/pyzor.if
20 index 593c03d..c05a504 100644
21 --- a/policy/modules/contrib/pyzor.if
22 +++ b/policy/modules/contrib/pyzor.if
23 @@ -132,5 +132,6 @@ interface(`pyzor_admin',`
24 files_search_var_lib($1)
25 admin_pattern($1, pyzor_var_lib_t)
26
27 - pyzor_role($2, $1)
28 + # This makes it impossible to apply _admin if _role has already been applied
29 + #pyzor_role($2, $1)
30 ')