From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1827F1382C5 for ; Wed, 25 Apr 2018 10:02:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F659E09D7; Wed, 25 Apr 2018 10:02:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0C4D9E09D7 for ; Wed, 25 Apr 2018 10:02:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4CF30335C43 for ; Wed, 25 Apr 2018 10:02:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8975E297 for ; Wed, 25 Apr 2018 10:02:36 +0000 (UTC) From: "Jason Zaman" 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" Message-ID: <1524629315.3ae0485c2f5e5d0a666ad48895df6ea4993b19fd.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/system/sysnetwork.if X-VCS-Directories: policy/modules/system/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 3ae0485c2f5e5d0a666ad48895df6ea4993b19fd X-VCS-Branch: master Date: Wed, 25 Apr 2018 10:02:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5a516eb3-877c-4ca0-baec-0768914feb2a X-Archives-Hash: 047c4ed49b9731ae3158488fb6998c88 commit: 3ae0485c2f5e5d0a666ad48895df6ea4993b19fd Author: Jason Zaman perfinion com> AuthorDate: Sun Apr 22 16:13:34 2018 +0000 Commit: Jason Zaman gentoo org> CommitDate: Wed Apr 25 04:08:35 2018 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=3ae0485c sysnetwork: put systemd_read_resolved_runtime in an ifdef commit f865919872a2d709d37f3df7032a6ea73bdd8080 (Interface to read /run/systemd/resolve/resolv.conf) Added an interface to sysnet_read_config which requires the systemd module loaded. Putting the interface in an optional_policy() is not possible since sysnet_read_config is called from several tunables so we use an ifdef. policy/modules/system/sysnetwork.if | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/policy/modules/system/sysnetwork.if b/policy/modules/system/sysnetwork.if index e9dc5401..693a26c6 100644 --- a/policy/modules/system/sysnetwork.if +++ b/policy/modules/system/sysnetwork.if @@ -348,7 +348,9 @@ interface(`sysnet_read_config',` files_search_etc($1) allow $1 net_conf_t:file read_file_perms; - systemd_read_resolved_runtime($1) + ifdef(`init_systemd',` + systemd_read_resolved_runtime($1) + ') ifdef(`distro_debian',` files_search_pids($1)