1 |
commit: 60135df3a91152af95bdab0fb136da7d5a3523e1 |
2 |
Author: Jason Zaman <jason <AT> perfinion <DOT> com> |
3 |
AuthorDate: Wed Nov 26 06:39:16 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=60135df3 |
7 |
|
8 |
remove spamassassin_role() from spamassassin_admin() |
9 |
|
10 |
spamassassin_role contains some named filetrans's which can not be |
11 |
applied twice. The roles already contain spamassassin_role which makes |
12 |
adding spamassassin_admin impossible. This removes the role so they can |
13 |
both be applied. |
14 |
|
15 |
--- |
16 |
policy/modules/contrib/spamassassin.if | 3 ++- |
17 |
1 file changed, 2 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/policy/modules/contrib/spamassassin.if b/policy/modules/contrib/spamassassin.if |
20 |
index 1499b0b..7f5a1cc 100644 |
21 |
--- a/policy/modules/contrib/spamassassin.if |
22 |
+++ b/policy/modules/contrib/spamassassin.if |
23 |
@@ -404,5 +404,6 @@ interface(`spamassassin_admin',` |
24 |
files_list_pids($1) |
25 |
admin_pattern($1, spamd_var_run_t) |
26 |
|
27 |
- spamassassin_role($2, $1) |
28 |
+ # This makes it impossible to apply _admin if _role has already been applied |
29 |
+ #spamassassin_role($2, $1) |
30 |
') |