From d6201f5d8daada3d64a0a3e0038e14eebec683ce Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 3 Aug 2016 22:59:23 +0200
Subject: Imported Upstream version 1.2.4

---
 policy/Makefile.in                                 |  1 +
 policy/org.freedesktop.NetworkManager.policy.in.in | 10 ++++++++++
 2 files changed, 11 insertions(+)

(limited to 'policy')

diff --git a/policy/Makefile.in b/policy/Makefile.in
index 50233b20..61eb0413 100644
--- a/policy/Makefile.in
+++ b/policy/Makefile.in
@@ -295,6 +295,7 @@ NEWT_LIBS = @NEWT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@
+NM_CONFIG_DEFAULT_DNS_RC_MANAGER = @NM_CONFIG_DEFAULT_DNS_RC_MANAGER@
 NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT = @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@
 NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT = @NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
diff --git a/policy/org.freedesktop.NetworkManager.policy.in.in b/policy/org.freedesktop.NetworkManager.policy.in.in
index 4df6d7e1..94d5cb82 100644
--- a/policy/org.freedesktop.NetworkManager.policy.in.in
+++ b/policy/org.freedesktop.NetworkManager.policy.in.in
@@ -18,6 +18,16 @@
     </defaults>
   </action>
 
+  <action id="org.freedesktop.NetworkManager.reload">
+    <_description>Reload NetworkManager configuration</_description>
+    <_message>System policy prevents reloading NetworkManager</_message>
+    <defaults>
+      <allow_any>auth_admin_keep</allow_any>
+      <allow_inactive>auth_admin_keep</allow_inactive>
+      <allow_active>auth_admin_keep</allow_active>
+    </defaults>
+  </action>
+
   <action id="org.freedesktop.NetworkManager.sleep-wake">
     <_description>Put NetworkManager to sleep or wake it up (should only be used by system power management)</_description>
     <_message>System policy prevents putting NetworkManager to sleep or waking it up</_message>
-- 
cgit 1.3.0-6-gf8a5