about summary refs log tree commit diff
path: root/src/org.freedesktop.NetworkManager.conf
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-03-30 00:57:20 +0200
committerMichael Biebl <biebl@debian.org>2016-03-30 00:57:20 +0200
commitdb70f92a77334e84ca9a04379afd49ea55c53098 (patch)
treed91e6ec27d66ec3c5a20c9195a0eb1d834189618 /src/org.freedesktop.NetworkManager.conf
parent4a76b5857faa586add8d7ce28f7804ffb65f3c68 (diff)
parentd9c99a29a0d3384c9c3d2adce430f5cb1134ab6a (diff)
Merge tag 'upstream/1.1.92'
Upstream version 1.1.92
Diffstat (limited to 'src/org.freedesktop.NetworkManager.conf')
-rw-r--r--src/org.freedesktop.NetworkManager.conf19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/org.freedesktop.NetworkManager.conf b/src/org.freedesktop.NetworkManager.conf
index 801d9a7d..dd630e19 100644
--- a/src/org.freedesktop.NetworkManager.conf
+++ b/src/org.freedesktop.NetworkManager.conf
@@ -11,7 +11,7 @@
 
                 <allow send_interface="org.freedesktop.NetworkManager.SecretAgent"/>
                 <!-- These are there because some broken policies do
-		     <allow send_interface="..." /> (see dbus-daemon(8) for details).
+		     <deny send_interface="..." /> (see dbus-daemon(8) for details).
 		     This seems to override that for the known VPN plugins.
                   -->
                 <allow send_destination="org.freedesktop.NetworkManager.openconnect"/>
@@ -113,13 +113,20 @@
 		     to the agents themselves. -->
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.NetworkManager.AgentManager"/>
-                <deny send_interface="org.freedesktop.NetworkManager.SecretAgent"/>
 
 		<!-- Root-only functions -->
-                <deny send_interface="org.freedesktop.NetworkManager" send_member="SetLogging"/>
-                <deny send_interface="org.freedesktop.NetworkManager" send_member="Sleep"/>
-                <deny send_interface="org.freedesktop.NetworkManager.Settings" send_member="LoadConnections"/>
-                <deny send_interface="org.freedesktop.NetworkManager.Settings" send_member="ReloadConnections"/>
+                <deny send_destination="org.freedesktop.NetworkManager"
+                      send_interface="org.freedesktop.NetworkManager"
+                      send_member="SetLogging"/>
+                <deny send_destination="org.freedesktop.NetworkManager"
+                      send_interface="org.freedesktop.NetworkManager"
+                      send_member="Sleep"/>
+                <deny send_destination="org.freedesktop.NetworkManager"
+                      send_interface="org.freedesktop.NetworkManager.Settings"
+                      send_member="LoadConnections"/>
+                <deny send_destination="org.freedesktop.NetworkManager"
+                      send_interface="org.freedesktop.NetworkManager.Settings"
+                      send_member="ReloadConnections"/>
         </policy>
 
 	<limit name="max_replies_per_connection">1024</limit>