diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-05-03 23:39:40 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-05-05 14:22:32 +0200 |
| commit | f57c20505110b951d067b9232ad7dcc2e6b50125 (patch) | |
| tree | 77377ef1dd9cc411cc8ef828888cf4fd86d77bd4 /clients | |
| parent | 0175056a6d70bafdaf1042eb8f5e1ef57484a3f2 (diff) | |
| download | NetworkManager-f57c20505110b951d067b9232ad7dcc2e6b50125.tar.gz | |
clients: add missing openvpn secret types to secret agent
Add support for asking a certificate password and a HTTP proxy
password for openvpn connections to the built-in secret agent.
https://bugzilla.gnome.org/show_bug.cgi?id=765553
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/common/nm-vpn-helpers.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c index fd04f155af..6671c1b33b 100644 --- a/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c @@ -98,6 +98,10 @@ nm_vpn_get_secret_names (const char *vpn_type) { const char *type; static VpnPasswordName generic_vpn_secrets[] = { {"password", N_("Password")}, {NULL, NULL} }; + static VpnPasswordName openvpn_secrets[] = { {"password", N_("Password")}, + {"cert-pass", N_("Certificate password")}, + {"http-proxy-password", N_("HTTP proxy password")}, + {NULL, NULL} }; static VpnPasswordName vpnc_secrets[] = { {"Xauth password", N_("Password")}, {"IPSec secret", N_("Group password")}, {NULL, NULL} }; @@ -117,13 +121,14 @@ nm_vpn_get_secret_names (const char *vpn_type) else type = vpn_type; - if ( !g_strcmp0 (type, "openvpn") - || !g_strcmp0 (type, "pptp") + if ( !g_strcmp0 (type, "pptp") || !g_strcmp0 (type, "iodine") || !g_strcmp0 (type, "ssh") || !g_strcmp0 (type, "l2tp") || !g_strcmp0 (type, "fortisslvpn")) return generic_vpn_secrets; + else if (!g_strcmp0 (type, "openvpn")) + return openvpn_secrets; else if (!g_strcmp0 (type, "vpnc")) return vpnc_secrets; else if ( !g_strcmp0 (type, "openswan") |