From: Alan T. DeKok <aland@freeradius.org>
Date: Sat, 1 Nov 2025 19:26:12 +0000 (-0400)
Subject: warn if Original-Packet-Code is missing
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf8a9d466541348b855dd46c53d8d237ffe21267;p=thirdparty%2Ffreeradius-server.git

warn if Original-Packet-Code is missing

and delete it if we see it
---

diff --git a/src/modules/rlm_radius/bio.c b/src/modules/rlm_radius/bio.c
index a41fe7ce05a..aa4a6355d77 100644
--- a/src/modules/rlm_radius/bio.c
+++ b/src/modules/rlm_radius/bio.c
@@ -2134,7 +2134,13 @@ static void request_demux(UNUSED fr_event_list_t *el, trunk_connection_t *tconn,
 		switch (code) {
 		case FR_RADIUS_CODE_PROTOCOL_ERROR:
 			protocol_error_reply(u, h);
-			fr_pair_delete_by_da(&request->reply_pairs, NULL, attr_original_packet_code);
+
+			vp = fr_pair_find_by_da(&request->reply_pairs, NULL, attr_original_packet_code);
+			if (!vp) {
+				RWDEBUG("Protocol-Error response is missing Original-Packet-Code");
+			} else {
+				fr_pair_delete_by_da(&request->reply_pairs, attr_original_packet_code);
+			}
 
 			vp = fr_pair_find_by_da(&request->reply_pairs, NULL, attr_error_cause);
 			if (!vp) {