summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-04-12 14:13:23 +0200
committerThomas Haller <thaller@redhat.com>2018-04-12 14:17:05 +0200
commitd5ee549e07b8f4c34b5d9c07d8048dbb9e8bd0ef (patch)
treefd2a0b36e0f79268c5c27d6c46bcf60ec3ea53ce
parent7dab990eb2e912099006c9a86c72c501ddc4b756 (diff)
device: let macsec connection fail on supplicant timeout if no secrets are required
Like for ethernet.
-rw-r--r--src/devices/nm-device-macsec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/devices/nm-device-macsec.c b/src/devices/nm-device-macsec.c
index 9927adb32c..a6759b3938 100644
--- a/src/devices/nm-device-macsec.c
+++ b/src/devices/nm-device-macsec.c
@@ -494,8 +494,10 @@ handle_auth_or_fail (NMDeviceMacsec *self,
macsec_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;
}