diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-06-20 19:04:34 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-06-20 19:04:34 +0200 |
| commit | 3b155d3cee04de073c18ede7c96387e917f284fe (patch) | |
| tree | f6d61594cf8c36a490a9041ea9bbc49ab3264109 | |
| parent | 7e0660bf073671f2eb9d86338c41019572800044 (diff) | |
| download | NetworkManager-3b155d3cee04de073c18ede7c96387e917f284fe.tar.gz | |
clients,vpn/trivial: rename argument of nm_vpn_get_secret_names()
| -rw-r--r-- | clients/common/nm-vpn-helpers.c | 10 | ||||
| -rw-r--r-- | clients/common/nm-vpn-helpers.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c index 142a106dca..f6f12176ee 100644 --- a/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c @@ -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") diff --git a/clients/common/nm-vpn-helpers.h b/clients/common/nm-vpn-helpers.h index e69e5b4e64..873753b614 100644 --- a/clients/common/nm-vpn-helpers.h +++ b/clients/common/nm-vpn-helpers.h @@ -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, |