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

make RADIUS use flat or nested attributes
---

diff --git a/src/process/radius/base.c b/src/process/radius/base.c
index bed75995296..705e20b3e14 100644
--- a/src/process/radius/base.c
+++ b/src/process/radius/base.c
@@ -769,7 +769,7 @@ RESUME(protocol_error)
 	/*
 	 *	https://tools.ietf.org/html/rfc7930#section-4
 	 */
-	vp = fr_pair_find_by_da(&request->reply_pairs, NULL, attr_original_packet_code);
+	vp = fr_pair_find_by_da_nested(&request->reply_pairs, NULL, attr_original_packet_code);
 	if (!vp) {
 		vp = fr_pair_afrom_da(request->reply_ctx, attr_original_packet_code);
 		if (vp) {
diff --git a/src/protocols/tacacs/encode.c b/src/protocols/tacacs/encode.c
index 70106131c16..6029060e9e0 100644
--- a/src/protocols/tacacs/encode.c
+++ b/src/protocols/tacacs/encode.c
@@ -857,7 +857,7 @@ ssize_t fr_tacacs_encode(fr_dbuff_t *dbuff, uint8_t const *original_packet, char
 			/*
 			 *	If the caller didn't set a session ID, use a random one.
 			 */
-			if (!fr_pair_find_by_da(vps, NULL, attr_tacacs_session_id)) {
+			if (!fr_pair_find_by_da_nested(vps, NULL, attr_tacacs_session_id)) {
 				packet->hdr.session_id = fr_rand();
 			}