From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-971632-garchives=archives.gentoo.org@lists.gentoo.org>
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 238721396D0
	for <garchives@archives.gentoo.org>; Sat,  9 Sep 2017 02:43:13 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 335DD1FC120;
	Sat,  9 Sep 2017 02:43:06 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(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 14C861FC120
	for <gentoo-commits@lists.gentoo.org>; Sat,  9 Sep 2017 02:43:06 +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 542773417DD
	for <gentoo-commits@lists.gentoo.org>; Sat,  9 Sep 2017 02:43:05 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id D60449087
	for <gentoo-commits@lists.gentoo.org>; Sat,  9 Sep 2017 02:43:01 +0000 (UTC)
From: "Jason Zaman" <perfinion@gentoo.org>
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" <perfinion@gentoo.org>
Message-ID: <1504910931.6a83af6917028efbce2bc00e2f9c8d850f42ed4d.perfinion@gentoo>
Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/
X-VCS-Repository: proj/hardened-refpolicy
X-VCS-Files: policy/modules/contrib/wm.te
X-VCS-Directories: policy/modules/contrib/
X-VCS-Committer: perfinion
X-VCS-Committer-Name: Jason Zaman
X-VCS-Revision: 6a83af6917028efbce2bc00e2f9c8d850f42ed4d
X-VCS-Branch: master
Date: Sat,  9 Sep 2017 02:43:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 83bfc461-fda1-4b0c-9ac7-83e39902c207
X-Archives-Hash: 6f791e22de54e2f64f1c5e3d8cefde92

commit:     6a83af6917028efbce2bc00e2f9c8d850f42ed4d
Author:     David Sugar <dsugar <AT> tresys <DOT> com>
AuthorDate: Wed Aug 30 16:09:53 2017 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Fri Sep  8 22:48:51 2017 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=6a83af69

wm: consolidate networkmanger interface calls into single optional

There was a networkmanager_* interface use not in an optional block.  I moved it into an existing optional block that already had another networkmanager_* interface use.

 policy/modules/contrib/wm.te | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/policy/modules/contrib/wm.te b/policy/modules/contrib/wm.te
index 65b57a4a..5986812f 100644
--- a/policy/modules/contrib/wm.te
+++ b/policy/modules/contrib/wm.te
@@ -70,8 +70,6 @@ miscfiles_read_fonts(wm_domain)
 miscfiles_read_generic_certs(wm_domain)
 miscfiles_read_localization(wm_domain)
 
-networkmanager_read_etc_files(wm_domain)
-
 udev_read_pid_files(wm_domain)
 
 # the following is needed by gnome-shell
@@ -123,6 +121,7 @@ optional_policy(`
 
 optional_policy(`
 	networkmanager_dbus_chat(wm_domain)
+	networkmanager_read_etc_files(wm_domain)
 ')
 
 optional_policy(`