Gentoo Archives: gentoo-commits

From: Jason Zaman <perfinion@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/
Date: Wed, 25 Apr 2018 10:02:43
Message-Id: 1524629315.3ae0485c2f5e5d0a666ad48895df6ea4993b19fd.perfinion@gentoo
1 commit: 3ae0485c2f5e5d0a666ad48895df6ea4993b19fd
2 Author: Jason Zaman <jason <AT> perfinion <DOT> com>
3 AuthorDate: Sun Apr 22 16:13:34 2018 +0000
4 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 25 04:08:35 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=3ae0485c
7
8 sysnetwork: put systemd_read_resolved_runtime in an ifdef
9
10 commit f865919872a2d709d37f3df7032a6ea73bdd8080
11 (Interface to read /run/systemd/resolve/resolv.conf)
12 Added an interface to sysnet_read_config which requires the systemd
13 module loaded. Putting the interface in an optional_policy() is not
14 possible since sysnet_read_config is called from several tunables so
15 we use an ifdef.
16
17 policy/modules/system/sysnetwork.if | 4 +++-
18 1 file changed, 3 insertions(+), 1 deletion(-)
19
20 diff --git a/policy/modules/system/sysnetwork.if b/policy/modules/system/sysnetwork.if
21 index e9dc5401..693a26c6 100644
22 --- a/policy/modules/system/sysnetwork.if
23 +++ b/policy/modules/system/sysnetwork.if
24 @@ -348,7 +348,9 @@ interface(`sysnet_read_config',`
25 files_search_etc($1)
26 allow $1 net_conf_t:file read_file_perms;
27
28 - systemd_read_resolved_runtime($1)
29 + ifdef(`init_systemd',`
30 + systemd_read_resolved_runtime($1)
31 + ')
32
33 ifdef(`distro_debian',`
34 files_search_pids($1)