Gentoo Archives: gentoo-commits

From: Sven Vermeulen <sven.vermeulen@××××××.be>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/
Date: Thu, 01 Nov 2012 21:42:44
Message-Id: 1351805848.948dd5e7540c27bc855176daeb8d2872676dcaf2.SwifT@gentoo
1 commit: 948dd5e7540c27bc855176daeb8d2872676dcaf2
2 Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
3 AuthorDate: Thu Nov 1 21:37:28 2012 +0000
4 Commit: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
5 CommitDate: Thu Nov 1 21:37:28 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=948dd5e7
7
8 Reshuffle gentoo specific webalizer changes
9
10 ---
11 policy/modules/contrib/webalizer.te | 12 +++++++-----
12 1 files changed, 7 insertions(+), 5 deletions(-)
13
14 diff --git a/policy/modules/contrib/webalizer.te b/policy/modules/contrib/webalizer.te
15 index e66b661..eab24f6 100644
16 --- a/policy/modules/contrib/webalizer.te
17 +++ b/policy/modules/contrib/webalizer.te
18 @@ -73,9 +73,15 @@ userdom_use_user_terminals(webalizer_t)
19 userdom_use_unpriv_users_fds(webalizer_t)
20 userdom_dontaudit_search_user_home_content(webalizer_t)
21
22 +ifdef(`distro_gentoo',`
23 + optional_policy(`
24 + nscd_socket_use(webalizer_t)
25 + ')
26 +')
27 +
28 optional_policy(`
29 apache_read_log(webalizer_t)
30 - apache_manage_sys_content(webalizer_t)
31 + apache_content_template(webalizer)
32 manage_dirs_pattern(webalizer_t, httpd_webalizer_content_t, httpd_webalizer_content_t)
33 manage_files_pattern(webalizer_t, httpd_webalizer_content_t, httpd_webalizer_content_t)
34 ')
35 @@ -89,9 +95,5 @@ optional_policy(`
36 ')
37
38 optional_policy(`
39 - nscd_socket_use(webalizer_t)
40 -')
41 -
42 -optional_policy(`
43 squid_read_log(webalizer_t)
44 ')