[network-manager-openswan/lr/multiple-vpn: 2/3] helper: add --bus-name argument

[Lubomir Rintel <lkundrak src gnome org>]

commit 6ce7421bf635b340bc12ddfe4ced12eb5870e5a1
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Thu Oct 29 09:40:05 2015 +0100

    helper: add --bus-name argument

 src/nm-openswan-service-helper.c |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/src/nm-openswan-service-helper.c b/src/nm-openswan-service-helper.c
index b4cbded..38ba394 100644
--- a/src/nm-openswan-service-helper.c
+++ b/src/nm-openswan-service-helper.c
@@ -35,6 +35,27 @@ main (int argc, char *argv[])
        GError *err = NULL;
        gchar **environ;
        gchar **p;
+       char *bus_name;
+
+       switch (argc) {
+       case 1:
+               bus_name = NM_DBUS_SERVICE_OPENSWAN;
+               break;
+       case 3:
+               if (strcmp (argv[1], "--bus-name") == 0) {
+                       bus_name = argv[2];
+                       break;
+               }
+               /* fallthrough */
+       default:
+               g_warning ("Usage: %s [--bus-name <name>]", argv[0]);
+               exit (1);
+       }
+
+       if (!g_dbus_is_name (bus_name)) {
+               g_warning ("Not a valid bus name: '%s'\n", bus_name);
+               exit (1);
+       }
 
 #if !GLIB_CHECK_VERSION (2, 35, 0)
        g_type_init ();
@@ -42,7 +63,7 @@ main (int argc, char *argv[])
 
        proxy = nmdbus_openswan_helper_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
                                                               G_DBUS_PROXY_FLAGS_NONE,
-                                                              NM_DBUS_SERVICE_OPENSWAN,
+                                                              bus_name,
                                                               NM_DBUS_PATH_OPENSWAN_HELPER,
                                                               NULL, &err);
        if (!proxy) {