From f75dd6fd1975146623052b843b182dc32c3fbe46 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Fri, 8 Apr 2011 07:30:59 +0200
Subject: Imported Upstream version 0.8.998

---
 src/NetworkManager.conf | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/NetworkManager.conf')

diff --git a/src/NetworkManager.conf b/src/NetworkManager.conf
index 1f1ed49b..b256a444 100644
--- a/src/NetworkManager.conf
+++ b/src/NetworkManager.conf
@@ -4,13 +4,12 @@
 <busconfig>
         <policy user="root">
                 <allow own="org.freedesktop.NetworkManager"/>
-                <allow own="org.freedesktop.NetworkManagerSystemSettings"/>
-
                 <allow send_destination="org.freedesktop.NetworkManager"/>
-                <allow send_destination="org.freedesktop.NetworkManagerSystemSettings"/>
 
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.PPP"/>
+
+                <allow send_interface="org.freedesktop.NetworkManager.SecretAgent"/>
         </policy>
         <policy at_console="true">
                 <allow send_destination="org.freedesktop.NetworkManager"/>
@@ -57,6 +56,9 @@
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.VPN.Connection"/>
 
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.AgentManager"/>
+
                 <deny send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager"
                        send_member="SetLogging"/>
@@ -75,10 +77,14 @@
         </policy>
         <policy context="default">
                 <deny own="org.freedesktop.NetworkManager"/>
-                <deny own="org.freedesktop.NetworkManagerSystemSettings"/>
 
                 <deny send_destination="org.freedesktop.NetworkManager"/>
-                <allow send_destination="org.freedesktop.NetworkManagerSystemSettings"/>
+
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.Settings"/>
+
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.NetworkManager.AgentManager"/>
 
                 <deny send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager"
@@ -95,10 +101,6 @@
                 <deny send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager"
                        send_member="wake"/>
-
-                <!-- The org.freedesktop.NetworkManagerSettings.Connection.Secrets
-                     interface is secured via PolicyKit.
-                  -->
         </policy>
 
         <limit name="max_replies_per_connection">512</limit>
-- 
cgit 1.3.0-6-gf8a5