summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2015-05-19 14:40:10 +0200
committerJiří Klimeš <jklimes@redhat.com>2015-05-19 14:48:25 +0200
commitdbf1794070bc6ea9fe906554839533a10401c4f4 (patch)
tree22e71a7e47f0e006e710735235ec4233713f7d92
parent4bab4294a68785b191f3802a2086368484d151d2 (diff)
downloadNetworkManager-dbf1794070bc6ea9fe906554839533a10401c4f4.tar.gz
libnm: NMVpnPluginOld: return service name as const string in need_secrets()
-rw-r--r--libnm/nm-vpn-plugin-old.c3
-rw-r--r--libnm/nm-vpn-plugin-old.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c
index b0334febcb..59ea65b413 100644
--- a/libnm/nm-vpn-plugin-old.c
+++ b/libnm/nm-vpn-plugin-old.c
@@ -480,7 +480,7 @@ impl_vpn_plugin_old_need_secrets (NMVpnPluginOld *plugin,
gpointer user_data)
{
NMConnection *connection;
- char *setting_name;
+ const char *setting_name;
gboolean needed;
GError *error = NULL;
@@ -511,7 +511,6 @@ impl_vpn_plugin_old_need_secrets (NMVpnPluginOld *plugin,
g_assert (setting_name);
g_dbus_method_invocation_return_value (context,
g_variant_new ("(s)", setting_name));
- g_free (setting_name);
} else {
/* No secrets required */
g_dbus_method_invocation_return_value (context,
diff --git a/libnm/nm-vpn-plugin-old.h b/libnm/nm-vpn-plugin-old.h
index 7fcc1c1c0a..af8f4ff61b 100644
--- a/libnm/nm-vpn-plugin-old.h
+++ b/libnm/nm-vpn-plugin-old.h
@@ -73,7 +73,7 @@ typedef struct {
gboolean (*need_secrets) (NMVpnPluginOld *plugin,
NMConnection *connection,
- char **setting_name,
+ const char **setting_name,
GError **error);
gboolean (*disconnect) (NMVpnPluginOld *plugin,