From: Nick Porter <nick@portercomputing.co.uk>
Date: Wed, 13 Nov 2024 11:30:43 +0000 (+0000)
Subject: Use more consistent name for subrequest
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcb116b564bd5f2deca3ea9fe9d20720ca3d80b3;p=thirdparty%2Ffreeradius-server.git

Use more consistent name for subrequest
---

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
index ba0c8b45bd7..e9649733962 100644
--- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -370,7 +370,7 @@ unlang_action_t eap_peap_process(rlm_rcode_t *p_result, request_t *request,
 				 eap_session_t *eap_session, fr_tls_session_t *tls_session)
 {
 	peap_tunnel_t	*t = tls_session->opaque;
-	request_t	*fake = NULL;
+	request_t	*child = NULL;
 	fr_pair_t	*vp;
 	rlm_rcode_t	rcode = RLM_MODULE_REJECT;
 	uint8_t const	*data;
@@ -495,8 +495,8 @@ unlang_action_t eap_peap_process(rlm_rcode_t *p_result, request_t *request,
 			goto finish;
 	}
 
-	fake = request_alloc_internal(request, &(request_init_args_t){ .parent = request });
-	fr_assert(fr_pair_list_empty(&fake->request_pairs));
+	MEM(child = unlang_subrequest_alloc(request, request->dict));
+	fr_assert(fr_pair_list_empty(&child->request_pairs));
 
 	switch (t->status) {
 	/*
@@ -514,7 +514,7 @@ unlang_action_t eap_peap_process(rlm_rcode_t *p_result, request_t *request,
 		len = t->username->vp_length + EAP_HEADER_LEN + 1;
 		t->status = PEAP_STATUS_PHASE2;
 
-		MEM(vp = fr_pair_afrom_da(fake->request_ctx, attr_eap_message));
+		MEM(vp = fr_pair_afrom_da(child->request_ctx, attr_eap_message));
 		MEM(fr_pair_value_mem_alloc(vp, &q, len, false) == 0);
 		q[0] = FR_EAP_CODE_RESPONSE;
 		q[1] = eap_round->response->id;
@@ -523,15 +523,15 @@ unlang_action_t eap_peap_process(rlm_rcode_t *p_result, request_t *request,
 		q[4] = FR_EAP_METHOD_IDENTITY;
 		memcpy(q + EAP_HEADER_LEN + 1,
 		       t->username->vp_strvalue, t->username->vp_length);
-		fr_pair_append(&fake->request_pairs, vp);
+		fr_pair_append(&child->request_pairs, vp);
 	}
 		break;
 
 	case PEAP_STATUS_PHASE2:
-		eap_peap_inner_to_pairs(fake->request_ctx, &fake->request_pairs,
+		eap_peap_inner_to_pairs(child->request_ctx, &child->request_pairs,
 					eap_round, data, data_len);
-		if (fr_pair_list_empty(&fake->request_pairs)) {
-			talloc_free(fake);
+		if (fr_pair_list_empty(&child->request_pairs)) {
+			talloc_free(child);
 			RDEBUG2("Unable to convert tunneled EAP packet to internal server data structures");
 			rcode = RLM_MODULE_REJECT;
 			goto finish;
@@ -545,7 +545,7 @@ unlang_action_t eap_peap_process(rlm_rcode_t *p_result, request_t *request,
 	}
 
 	RDEBUG2("Got tunneled request");
-	log_request_pair_list(L_DBG_LVL_2, request, NULL, &fake->request_pairs, NULL);
+	log_request_pair_list(L_DBG_LVL_2, request, NULL, &child->request_pairs, NULL);
 
 	/*
 	 *	Update other items in the request_t data structure.
@@ -568,8 +568,8 @@ unlang_action_t eap_peap_process(rlm_rcode_t *p_result, request_t *request,
 	} /* else there WAS a t->username */
 
 	if (t->username) {
-		vp = fr_pair_copy(fake->request_ctx, t->username);
-		fr_pair_append(&fake->request_pairs, vp);
+		vp = fr_pair_copy(child->request_ctx, t->username);
+		fr_pair_append(&child->request_pairs, vp);
 		RDEBUG2("Setting &request.User-Name from tunneled (inner) identity \"%s\"",
 			vp->vp_strvalue);
 	} else {
@@ -593,7 +593,7 @@ unlang_action_t eap_peap_process(rlm_rcode_t *p_result, request_t *request,
 	}
 
 finish:
-	talloc_free(fake);
+	talloc_free(child);
 
 	RETURN_MODULE_RCODE(rcode);
 }