check for radiusv11 and MA / Original-Packet-Code

diff --git a/src/lib/radius.c b/src/lib/radius.c
index b2de15b2524886fd1fa192f52a4754342d98e1a5..357d0e8ec9551d570af50fcab5036145804bcda2 100644 (file)
--- 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;
                }