From 549021b5ddbc7cce51d604b6cee3ae900dd5628d Mon Sep 17 00:00:00 2001 From: Andrew Zaborowski Date: Thu, 9 Aug 2018 02:33:17 +0200 Subject: [PATCH] eap-gtc: Fix reading secret from settings This makes testEAP-PEAP-GTC pass for me by re-adding the check for the GTC-Secret setting which was replaced with the check for the secrets list in 3d2285ec7e31f632b09893417165fea048ff9e32. --- src/eap-gtc.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/eap-gtc.c b/src/eap-gtc.c index 056e6771..e39429f5 100644 --- a/src/eap-gtc.c +++ b/src/eap-gtc.c @@ -100,12 +100,16 @@ static int eap_gtc_check_settings(struct l_settings *settings, return 0; } - secret = l_queue_find(secrets, eap_secret_info_match, setting2); /* identity found, but secret missing */ - if (!secret) - eap_append_secret(out_missing, EAP_SECRET_REMOTE_PASSWORD, - setting2, NULL, identity, - EAP_CACHE_NEVER); + if (!l_settings_get_value(settings, "Security", setting2)) { + secret = l_queue_find(secrets, eap_secret_info_match, setting2); + + if (!secret) + eap_append_secret(out_missing, + EAP_SECRET_REMOTE_PASSWORD, + setting2, NULL, identity, + EAP_CACHE_NEVER); + } return 0; }