[network-manager-openvpn/lr/multiple-vpn: 4/4] mm

[Lubomir Rintel <lkundrak src gnome org>]

commit bc48492489af11971e4bc0fe6797389d495f14b3
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Wed Aug 19 21:43:13 2015 +0200

    mm

 nm-openvpn-service.conf  |    4 ++--
 src/nm-openvpn-service.c |    6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/nm-openvpn-service.conf b/nm-openvpn-service.conf
index a597076..243ab48 100644
--- a/nm-openvpn-service.conf
+++ b/nm-openvpn-service.conf
@@ -3,11 +3,11 @@
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd";>
 <busconfig>
        <policy user="root">
-               <allow own="org.freedesktop.NetworkManager.openvpn"/>
+               <allow own_prefix="org.freedesktop.NetworkManager.openvpn"/>
                <allow send_destination="org.freedesktop.NetworkManager.openvpn"/>
        </policy>
        <policy context="default">
-               <deny own="org.freedesktop.NetworkManager.openvpn"/>
+               <deny own_prefix="org.freedesktop.NetworkManager.openvpn"/>
                <deny send_destination="org.freedesktop.NetworkManager.openvpn"/>
        </policy>
 </busconfig>
diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
index 1a09b37..b9f93bf 100644
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -887,6 +887,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
        gboolean dev_type_is_tap;
        char *stmp;
        const char *defport, *proto_tcp;
+       gchar *bus_name;
 
        /* Find openvpn */
        openvpn_binary = nm_find_openvpn ();
@@ -1192,8 +1193,9 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
 
        /* Up script, called when connection has been established or has been restarted */
        add_openvpn_arg (args, "--up");
-       stmp = g_strdup_printf ("%s%s %s --", NM_OPENVPN_HELPER_PATH, debug ? " --helper-debug" : "",
-                               dev_type_is_tap ? "--tap" : "--tun");
+       g_object_get (plugin, NM_VPN_SERVICE_PLUGIN_DBUS_SERVICE_NAME, &bus_name, NULL);
+       stmp = g_strdup_printf ("%s%s --bus-name %s %s --", NM_OPENVPN_HELPER_PATH, debug ? " --helper-debug" 
: "",
+                               bus_name, dev_type_is_tap ? "--tap" : "--tun");
        add_openvpn_arg (args, stmp);
        g_free (stmp);
        add_openvpn_arg (args, "--up-restart");