about summary refs log tree commit diff
path: root/src/NetworkManager.conf
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-08-23 19:17:03 +0200
committerMichael Biebl <biebl@debian.org>2011-08-23 19:17:03 +0200
commit72acf6b5cf8cf7df57288a5ebca56cd84d21ff62 (patch)
tree45a40c078a86d4043a303ca0f81735daf263f175 /src/NetworkManager.conf
parent232698d28a1764e179f668f480738b8c7117e70a (diff)
parent263bf4c0c89bb88dc995acd9a6a2de9095fbd461 (diff)
Merge commit 'upstream/0.9.0' into experimental
Diffstat (limited to 'src/NetworkManager.conf')
-rw-r--r--src/NetworkManager.conf13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/NetworkManager.conf b/src/NetworkManager.conf
index b256a444..15b11b7e 100644
--- a/src/NetworkManager.conf
+++ b/src/NetworkManager.conf
@@ -10,6 +10,19 @@
                        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.
+                  -->
+                <allow send_destination="org.freedesktop.NetworkManager.openconnect"/>
+                <allow send_destination="org.freedesktop.NetworkManager.openswan"/>
+                <allow send_destination="org.freedesktop.NetworkManager.openvpn"/>
+                <allow send_destination="org.freedesktop.NetworkManager.pptp"/>
+                <allow send_destination="org.freedesktop.NetworkManager.vpnc"/>
         </policy>
         <policy at_console="true">
                 <allow send_destination="org.freedesktop.NetworkManager"/>