about summary refs log tree commit diff
path: root/src/NetworkManager.conf
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-04-21 10:42:53 +0200
committerMichael Biebl <biebl@debian.org>2011-04-21 10:42:53 +0200
commit8baa1aca8dfd35e3190d7d5655eb83b5b901e263 (patch)
treea9ac1e67d0c22a48330c76f08fc5291f85307055 /src/NetworkManager.conf
parentf75dd6fd1975146623052b843b182dc32c3fbe46 (diff)
Imported Upstream version 0.8.4.0 upstream/0.8.4.0
Diffstat (limited to 'src/NetworkManager.conf')
-rw-r--r--src/NetworkManager.conf20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/NetworkManager.conf b/src/NetworkManager.conf
index b256a444..1f1ed49b 100644
--- a/src/NetworkManager.conf
+++ b/src/NetworkManager.conf
@@ -4,12 +4,13 @@
 <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"/>
@@ -56,9 +57,6 @@
                 <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"/>
@@ -77,14 +75,10 @@
         </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.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.Settings"/>
-
-                <allow send_destination="org.freedesktop.NetworkManager"
-                       send_interface="org.freedesktop.NetworkManager.AgentManager"/>
+                <allow send_destination="org.freedesktop.NetworkManagerSystemSettings"/>
 
                 <deny send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager"
@@ -101,6 +95,10 @@
                 <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>