From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 31 Oct 2023 21:48:28 +0000 (-0400)
Subject: check for radiusv11 and MA / Original-Packet-Code
X-Git-Tag: release_3_2_4~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22cfa89fcff23027ed481437b068520a1933e36e;p=thirdparty%2Ffreeradius-server.git

check for radiusv11 and MA / Original-Packet-Code
---

diff --git a/src/lib/radius.c b/src/lib/radius.c
index b2de15b252..357d0e8ec9 100644
--- a/src/lib/radius.c
+++ b/src/lib/radius.c
@@ -1945,7 +1945,7 @@ int rad_encode(RADIUS_PACKET *packet, RADIUS_PACKET const *original,
 		/*
 		 *	Do not encode Message-Authenticator for RADIUS/1.1
 		 */
-		if ((reply->da->vendor == 0) && (reply->da->attr == PW_MESSAGE_AUTHENTICATOR)) {
+		if (packet->radiusv11 && (reply->da->vendor == 0) && (reply->da->attr == PW_MESSAGE_AUTHENTICATOR)) {
 			reply = reply->next;
 			continue;
 		}
@@ -1954,7 +1954,7 @@ int rad_encode(RADIUS_PACKET *packet, RADIUS_PACKET const *original,
 		/*
 		 *	Do not encode Original-Packet-Code for RADIUS/1.1
 		 */
-		if (reply->da->vendor == ((unsigned int) PW_EXTENDED_ATTRIBUTE_1 << 24) && (reply->da->attr == 4)) {
+		if (packet->radiusv11 && reply->da->vendor == ((unsigned int) PW_EXTENDED_ATTRIBUTE_1 << 24) && (reply->da->attr == 4)) {
 			reply = reply->next;
 			continue;
 		}