[network-manager-libreswan/lr/import-export: 2/7] all: recognize the openswan VPN service name as well



commit 0b4abacd3e073e4c2f7a2e706a8cf050c089734d
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Mon Dec 7 12:41:46 2015 +0100

    all: recognize the openswan VPN service name as well

 auth-dialog/main.c         |    3 ++-
 src/nm-libreswan-service.h |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index b0ce651..5e68300 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -467,7 +467,8 @@ main (int argc, char *argv[])
                return 1;
        }
 
-       if (strcmp (vpn_service, NM_VPN_SERVICE_TYPE_LIBRESWAN) != 0) {
+       if (   strcmp (vpn_service, NM_VPN_SERVICE_TYPE_LIBRESWAN) != 0
+           && strcmp (vpn_service, NM_VPN_SERVICE_TYPE_OPENSWAN) != 0) {
                fprintf (stderr, "This dialog only works with the '%s' service\n", 
NM_VPN_SERVICE_TYPE_LIBRESWAN);
                return 1;
        }
diff --git a/src/nm-libreswan-service.h b/src/nm-libreswan-service.h
index b3fe3b9..201b523 100644
--- a/src/nm-libreswan-service.h
+++ b/src/nm-libreswan-service.h
@@ -25,6 +25,7 @@
 #include <glib-object.h>
 
 #define NM_VPN_SERVICE_TYPE_LIBRESWAN "org.freedesktop.NetworkManager.libreswan"
+#define NM_VPN_SERVICE_TYPE_OPENSWAN  "org.freedesktop.NetworkManager.openswan"
 
 #define NM_DBUS_SERVICE_LIBRESWAN     "org.freedesktop.NetworkManager.libreswan"
 #define NM_DBUS_INTERFACE_LIBRESWAN   "org.freedesktop.NetworkManager.libreswan"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]