diff options
| author | Michael Schaller <misch@rodete-desktop-imager.corp.google.com> | 2018-04-12 13:56:30 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-04-12 14:16:53 +0200 |
| commit | 7dab990eb2e912099006c9a86c72c501ddc4b756 (patch) | |
| tree | cf74384a9797dbdcd825d84673249b1a465fce66 | |
| parent | f92a68c9e50ad7a368f7b6259b785cdfa98aa77f (diff) | |
device: let Ethernet connection fail on supplicant timeout if no secrets are required
Without this patch an Ethernet connection attempt that encountered a supplicant
timeout was stuck in the needs-auth state even if it didn't require secrets.
This patch applies the respective WiFi behaviour also to Ethernet devices.
https://bugzilla.gnome.org/show_bug.cgi?id=795196
https://github.com/NetworkManager/NetworkManager/pull/92
| -rw-r--r-- | src/devices/nm-device-ethernet.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 16fa431463..f0b411e344 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -671,8 +671,10 @@ handle_auth_or_fail (NMDeviceEthernet *self, wired_secrets_get_secrets (self, setting_name, NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION | (new_secrets ? NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW : 0)); - } else + } else { _LOGI (LOGD_DEVICE, "Cleared secrets, but setting didn't need any secrets."); + return NM_ACT_STAGE_RETURN_FAILURE; + } return NM_ACT_STAGE_RETURN_POSTPONE; } |