From: Jorge Pereira <jpereira@users.noreply.github.com>
Date: Wed, 8 Feb 2023 15:56:57 +0000 (-0300)
Subject: tacacs: let's avoid _magic_ values (#4886)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4f8296105dad3534bdab58a5bba5574b7e293da;p=thirdparty%2Ffreeradius-server.git

tacacs: let's avoid _magic_ values (#4886)
---

diff --git a/src/protocols/tacacs/decode.c b/src/protocols/tacacs/decode.c
index 7265b3c5e4d..0b11a7628fc 100644
--- a/src/protocols/tacacs/decode.c
+++ b/src/protocols/tacacs/decode.c
@@ -375,8 +375,8 @@ ssize_t fr_tacacs_decode(TALLOC_CTX *ctx, fr_pair_list_t *out, uint8_t const *bu
 	/*
 	 *	TACACS major / minor version MUST be 12.0 or 12.1
 	 */
-	if (!((buffer[0] == 0xc0) || (buffer[0] == 0xc1))) {
-		fr_strerror_printf("Unsupported TACACS+ version %02x", buffer[0]);
+	if (!(pkt->hdr.ver.major == 12 && (pkt->hdr.ver.minor == 0 || pkt->hdr.ver.minor == 1))) {
+		fr_strerror_printf("Unsupported TACACS+ version %d.%d (%02x)", pkt->hdr.ver.major, pkt->hdr.ver.minor, buffer[0]);
 		return -1;
 	}