diff --git a/src/eap-gtc.c b/src/eap-gtc.c index 90c2a71e..0a431f87 100644 --- a/src/eap-gtc.c +++ b/src/eap-gtc.c @@ -144,11 +144,8 @@ static bool eap_gtc_load_settings(struct eap_state *eap, prefix); password = l_settings_get_string(settings, "Security", password_key); - - if (!password) { - l_error("Property '%sPassword' is missing.", prefix); + if (!password) return false; - } } gtc = l_new(struct eap_gtc_state, 1); diff --git a/src/eap-md5.c b/src/eap-md5.c index 0b249456..aea4b009 100644 --- a/src/eap-md5.c +++ b/src/eap-md5.c @@ -160,11 +160,8 @@ static bool eap_md5_load_settings(struct eap_state *eap, prefix); secret = l_settings_get_string(settings, "Security", password_key); - - if (!secret) { - l_error("Property '%sPassword' is missing.", prefix); + if (!secret) return false; - } } md5 = l_new(struct eap_md5_state, 1); diff --git a/src/eap-mschapv2.c b/src/eap-mschapv2.c index 5fbf0ed2..d1115672 100644 --- a/src/eap-mschapv2.c +++ b/src/eap-mschapv2.c @@ -545,10 +545,8 @@ static bool eap_mschapv2_load_settings(struct eap_state *eap, snprintf(setting, sizeof(setting), "%sIdentity", prefix); state->user = l_settings_get_string(settings, "Security", setting); - if (!state->user) { - l_error("'%s' setting is missing", setting); + if (!state->user) goto error; - } state->user_len = strlen(state->user); @@ -565,11 +563,8 @@ static bool eap_mschapv2_load_settings(struct eap_state *eap, snprintf(setting, sizeof(setting), "%sPassword-Hash", prefix); hash_str = l_settings_get_value(settings, "Security", setting); - if (!hash_str) { - l_error("Neither '%sPassword' or '%sPassword-Hash' " - "setting was provided", prefix, prefix); + if (!hash_str) goto error; - } tmp = l_util_from_hexstring(hash_str, &len); memcpy(state->password_hash, tmp, 16);