From 494f296a3baab08522617b24b1f126d8f9a17502 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 20 Jan 2016 16:26:51 +0100
Subject: Imported Upstream version 1.1.90

---
 src/org.freedesktop.NetworkManager.conf | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/org.freedesktop.NetworkManager.conf')

diff --git a/src/org.freedesktop.NetworkManager.conf b/src/org.freedesktop.NetworkManager.conf
index 10c6184e..801d9a7d 100644
--- a/src/org.freedesktop.NetworkManager.conf
+++ b/src/org.freedesktop.NetworkManager.conf
@@ -10,13 +10,9 @@
                        send_interface="org.freedesktop.NetworkManager.PPP"/>
 
                 <allow send_interface="org.freedesktop.NetworkManager.SecretAgent"/>
-
-                <!-- Allow NM to talk to known VPN plugins; due to a bug in
-                     the D-Bus daemon, when a plugin is installed and the user
-                     immediately tries to use it, the VPN plugin's rules aren't
-                     always loaded into dbus-daemon.  Those rules allow NM to
-                     talk to the plugin.  Oops.  Work around that by explicitly
-                     allowing NM to talk to VPN plugins here.
+                <!-- These are there because some broken policies do
+		     <allow 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"/>
                 <allow send_destination="org.freedesktop.NetworkManager.openswan"/>
@@ -29,6 +25,7 @@
                 <allow send_destination="org.freedesktop.NetworkManager.libreswan"/>
                 <allow send_destination="org.freedesktop.NetworkManager.fortisslvpn"/>
                 <allow send_destination="org.freedesktop.NetworkManager.strongswan"/>
+                <allow send_interface="org.freedesktop.NetworkManager.VPN.Plugin"/>
         </policy>
         <policy context="default">
                 <deny own="org.freedesktop.NetworkManager"/>
@@ -40,6 +37,8 @@
                        send_interface="org.freedesktop.DBus.Introspectable"/>
                 <allow send_destination="org.freedesktop.NetworkManager"
                        send_interface="org.freedesktop.DBus.Properties"/>
+                <allow send_destination="org.freedesktop.NetworkManager"
+                       send_interface="org.freedesktop.DBus.ObjectManager"/>
 
 		<!-- Devices (read-only properties, no methods) -->
                 <allow send_destination="org.freedesktop.NetworkManager"
@@ -121,10 +120,9 @@
                 <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_interface="org.freedesktop.NetworkManager.VPN.Plugin"/>
-                <deny send_interface="org.freedesktop.NetworkManager.PPP"/>
         </policy>
 
 	<limit name="max_replies_per_connection">1024</limit>
+	<limit name="max_match_rules_per_connection">2048</limit>
 </busconfig>
 
-- 
cgit 1.3.0-6-gf8a5