diff options
| author | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:09 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:09 +0100 |
| commit | 58f8be580039b0575b197b9573a1c92745d96d30 (patch) | |
| tree | 2c226233f623a0dcb529be0eb8cdf97e4a2ae0c0 /clients/common | |
| parent | 45cb5bb3c0e6edb887cf69b417fcaf7053814a9b (diff) | |
New upstream version 1.5.90 upstream/1.5.90
Diffstat (limited to 'clients/common')
| -rw-r--r-- | clients/common/nm-secret-agent-simple.c | 21 | ||||
| -rw-r--r-- | clients/common/nm-vpn-helpers.c | 2 |
2 files changed, 21 insertions, 2 deletions
diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c index 4e59f489..b763bf89 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -492,7 +492,7 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request) secret = nm_secret_agent_simple_secret_new (_("PIN"), NM_SETTING (s_gsm), NM_SETTING_GSM_PIN, - NULL, + NULL, NULL, FALSE); g_ptr_array_add (secrets, secret); @@ -509,6 +509,25 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request) TRUE); g_ptr_array_add (secrets, secret); } + } else if (nm_connection_is_type (request->connection, NM_SETTING_MACSEC_SETTING_NAME)) { + NMSettingMacsec *s_macsec = nm_connection_get_setting_macsec (request->connection); + + msg = g_strdup_printf (_("Secrets are required to access the MACsec network '%s'"), + nm_connection_get_id (request->connection)); + + if (nm_setting_macsec_get_mode (s_macsec) == NM_SETTING_MACSEC_MODE_PSK) { + title = _("MACsec PSK authentication"); + secret = nm_secret_agent_simple_secret_new (_("MKA CAK"), + NM_SETTING (s_macsec), + NM_SETTING_MACSEC_MKA_CAK, + NULL, + NULL, + TRUE); + g_ptr_array_add (secrets, secret); + } else { + title = _("MACsec EAP authentication"); + ok = add_8021x_secrets (request, secrets); + } } else if (nm_connection_is_type (request->connection, NM_SETTING_CDMA_SETTING_NAME)) { NMSettingCdma *s_cdma = nm_connection_get_setting_cdma (request->connection); diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c index f6f12176..d2bb8cba 100644 --- a/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c @@ -56,7 +56,7 @@ nm_vpn_get_editor_plugin (const char *service_type, GError **error) if ( !nm_vpn_plugin_info_get_plugin (plugin_info) && nm_vpn_plugin_info_lookup_property (plugin_info, NM_VPN_PLUGIN_INFO_KF_GROUP_GNOME, "properties")) { g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_FAILED, - _("cannot cannot load legacy-only VPN plugin \"%s\" for \"%s\""), + _("cannot load legacy-only VPN plugin \"%s\" for \"%s\""), nm_vpn_plugin_info_get_name (plugin_info), nm_vpn_plugin_info_get_filename (plugin_info)); } else if (g_error_matches (local, G_FILE_ERROR, G_FILE_ERROR_NOENT)) { |