From: Jorge Pereira <jpereira@freeradius.org>
Date: Fri, 26 May 2023 01:54:24 +0000 (-0300)
Subject: make MSCHAP use flat or nested attributes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23e118913e67ae1738cc6340afa3c637da1070df;p=thirdparty%2Ffreeradius-server.git

make MSCHAP use flat or nested attributes
---

diff --git a/src/modules/rlm_mschap/auth_wbclient.c b/src/modules/rlm_mschap/auth_wbclient.c
index bc4b00bce26..9a38f1046ea 100644
--- a/src/modules/rlm_mschap/auth_wbclient.c
+++ b/src/modules/rlm_mschap/auth_wbclient.c
@@ -182,13 +182,13 @@ int do_auth_wbclient(rlm_mschap_t const *inst, request_t *request,
 			fr_box_strvalue_buffer(normalised_username));
 
 		/* Recalculate hash */
-		vp_challenge = fr_pair_find_by_da(&request->request_pairs, NULL, attr_ms_chap_challenge);
+		vp_challenge = fr_pair_find_by_da_nested(&request->request_pairs, NULL, attr_ms_chap_challenge);
 		if (!vp_challenge) {
 			RERROR("Unable to get MS-CHAP-Challenge");
 			goto release;
 		}
 
-		vp_response = fr_pair_find_by_da(&request->request_pairs, NULL, attr_ms_chap2_response);
+		vp_response = fr_pair_find_by_da_nested(&request->request_pairs, NULL, attr_ms_chap2_response);
 		if (!vp_response) {
 			RERROR("Unable to get MS-CHAP2-Response");
 			goto release;
diff --git a/src/modules/rlm_mschap/opendir.c b/src/modules/rlm_mschap/opendir.c
index d254cb22c85..c0faca271ab 100644
--- a/src/modules/rlm_mschap/opendir.c
+++ b/src/modules/rlm_mschap/opendir.c
@@ -239,7 +239,7 @@ unlang_action_t od_mschap_auth(rlm_rcode_t *p_result, request_t *request, fr_pai
 	unsigned int t;
 #endif
 
-	response = fr_pair_find_by_da(&request->request_pairs, NULL, attr_ms_chap2_response);
+	response = fr_pair_find_by_da_nested(&request->request_pairs, NULL, attr_ms_chap2_response);
 
 	username_string = talloc_array(request, char, usernamepair->vp_length + 1);
 	if (!username_string) RETURN_MODULE_FAIL;