fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-05 14:40:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

clients,vpn/trivial: rename argument of nm_vpn_get_secret_names()

Browse source
This commit is contained in:
Thomas Haller 2016-06-20 19:04:34 +02:00
parent 7e0660bf07
commit 3b155d3cee
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clients/common/nm-vpn-helpers.c
View file

@ -113,7 +113,7 @@ nm_vpn_supports_ipv6 (NMConnection *connection)
}
const VpnPasswordName *
nm_vpn_get_secret_names (const char *vpn_type)
nm_vpn_get_secret_names (const char *service_type)
{
const char *type;
static VpnPasswordName generic_vpn_secrets[] = { {"password", N_("Password")}, {NULL, NULL} };
@ -132,16 +132,16 @@ nm_vpn_get_secret_names (const char *vpn_type)
{"gwcert", N_("Gateway certificate hash")},
{NULL, NULL} };
if (!vpn_type)
if (!service_type)
return NULL;
if ( !g_str_has_prefix (vpn_type, NM_DBUS_INTERFACE)
|| vpn_type[NM_STRLEN (NM_DBUS_INTERFACE)] != '.') {
if ( !g_str_has_prefix (service_type, NM_DBUS_INTERFACE)
|| service_type[NM_STRLEN (NM_DBUS_INTERFACE)] != '.') {
/* all our well-known, hard-coded vpn-types start with NM_DBUS_INTERFACE. */
return NULL;
}
type = vpn_type + (NM_STRLEN (NM_DBUS_INTERFACE) + 1);
type = service_type + (NM_STRLEN (NM_DBUS_INTERFACE) + 1);
if ( !g_strcmp0 (type, "pptp")
|| !g_strcmp0 (type, "iodine")
|| !g_strcmp0 (type, "ssh")

2
clients/common/nm-vpn-helpers.h
View file

@ -34,7 +34,7 @@ NMVpnEditorPlugin *nm_vpn_get_editor_plugin (const char *service_type, GError **
gboolean nm_vpn_supports_ipv6 (NMConnection *connection);
const VpnPasswordName * nm_vpn_get_secret_names (const char *vpn_type);
const VpnPasswordName * nm_vpn_get_secret_names (const char *service_type);
gboolean nm_vpn_openconnect_authenticate_helper (const char *host,
char **cookie,