[network-manager-openswan/lr/multiple-vpn] fixup! service: process the configuration in the service, not the helper



commit 47df7148ad5d5d6c02c2a1d676d24bfaaaad8da7
Author: Thomas Haller <thaller redhat com>
Date:   Tue Nov 3 13:28:53 2015 +0100

    fixup! service: process the configuration in the service, not the helper

 src/nm-openswan-service.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/nm-openswan-service.c b/src/nm-openswan-service.c
index ad5f628..b7b49ce 100644
--- a/src/nm-openswan-service.c
+++ b/src/nm-openswan-service.c
@@ -1126,7 +1126,7 @@ lookup_string (GVariant *dict, const gchar *key)
 {
        const gchar *value = NULL;
 
-       g_variant_lookup (dict, key, "s", &value);
+       g_variant_lookup (dict, key, "&s", &value);
        return value;
 }
 
@@ -1237,7 +1237,7 @@ handle_callback (NMDBusOpenswanHelper *object,
        for (iter = priv->routes; iter; iter = g_slist_next (iter))
                g_variant_builder_add_value (&builder, (GVariant *) iter->data);
        g_variant_builder_add (&config, "{sv}", NM_VPN_PLUGIN_IP4_CONFIG_ROUTES,
-                              g_variant_builder_end (&builder));
+                              g_variant_builder_end (&builder));
 
        /* :( */
        if (have_sad_routes (lookup_string (env, "PLUTO_PEER")))


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