colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wired: only request new secrets during the inital connection

Browse Source 
This ports commit 30fe3e1876
for wifi to ethernet.

https://bugzilla.gnome.org/show_bug.cgi?id=720265

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Michael Schaller
2013-12-11 16:06:35 +01:00
committed by Thomas Haller
parent 31fe84e467
commit 6b5d31954f
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/devices/nm-device-ethernet.c
View File

@@ -56,6 +56,7 @@
#include "nm-dbus-manager.h" #include "nm-dbus-manager.h"
#include "nm-platform.h" #include "nm-platform.h"
#include "nm-dcb.h" #include "nm-dcb.h"
#include "nm-settings-connection.h"
#include "nm-device-ethernet-glue.h" #include "nm-device-ethernet-glue.h"
@@ -811,10 +812,7 @@ handle_auth_or_fail (NMDeviceEthernet *self,
if (setting_name) { if (setting_name) {
NMSettingsGetSecretsFlags flags = NM_SETTINGS_GET_SECRETS_FLAG_ALLOW_INTERACTION; NMSettingsGetSecretsFlags flags = NM_SETTINGS_GET_SECRETS_FLAG_ALLOW_INTERACTION;
/* If the caller doesn't necessarily want completely new secrets, if (new_secrets)
* only ask for new secrets after the first failure.
*/
if (new_secrets || tries)
flags |= NM_SETTINGS_GET_SECRETS_FLAG_REQUEST_NEW; flags |= NM_SETTINGS_GET_SECRETS_FLAG_REQUEST_NEW;
nm_act_request_get_secrets (req, setting_name, flags, NULL, wired_secrets_cb, self); nm_act_request_get_secrets (req, setting_name, flags, NULL, wired_secrets_cb, self);
@@ -833,13 +831,18 @@ supplicant_connection_timeout_cb (gpointer user_data)
NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self); NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
NMDevice *device = NM_DEVICE (self); NMDevice *device = NM_DEVICE (self);
NMActRequest *req; NMActRequest *req;
NMConnection *connection;
const char *iface; const char *iface;
guint64 timestamp = 0;
gboolean new_secrets = TRUE;
priv->supplicant.con_timeout_id = 0; priv->supplicant.con_timeout_id = 0;
iface = nm_device_get_iface (device); iface = nm_device_get_iface (device);
/* Authentication failed, encryption key is probably bad */ /* Authentication failed; either driver problems, the encryption key is
* wrong, the passwords or certificates were wrong or the Ethernet switch's
* port is not configured for 802.1x. */
nm_log_warn (LOGD_DEVICE | LOGD_ETHER, nm_log_warn (LOGD_DEVICE | LOGD_ETHER,
"Activation (%s/wired): association took too long.", iface); "Activation (%s/wired): association took too long.", iface);
@@ -847,7 +850,17 @@ supplicant_connection_timeout_cb (gpointer user_data)
req = nm_device_get_act_request (device); req = nm_device_get_act_request (device);
g_assert (req); g_assert (req);
if (handle_auth_or_fail (self, req, TRUE) == NM_ACT_STAGE_RETURN_POSTPONE) { connection = nm_act_request_get_connection (req);
g_assert (connection);
/* Ask for new secrets only if we've never activated this connection
* before. If we've connected before, don't bother the user with dialogs,
* just retry or fail, and if we never connect the user can fix the
* password somewhere else. */
if (nm_settings_connection_get_timestamp (NM_SETTINGS_CONNECTION (connection), &timestamp))
new_secrets = !timestamp;
if (handle_auth_or_fail (self, req, new_secrets) == NM_ACT_STAGE_RETURN_POSTPONE) {
nm_log_info (LOGD_DEVICE | LOGD_ETHER, nm_log_info (LOGD_DEVICE | LOGD_ETHER,
"Activation (%s/wired): asking for new secrets", iface); "Activation (%s/wired): asking for new secrets", iface);
} else } else