From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 12 Sep 2024 07:57:48 +0000 (+0100)
Subject: Revert "Allow smaller uint types when calculating IPv4 prefix"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9e4c4dd5a2d4311e37793b7c09f33fce8ac3f82;p=thirdparty%2Ffreeradius-server.git

Revert "Allow smaller uint types when calculating IPv4 prefix"

This reverts commit b0d9e73d9c97202f941717b7f0c63a8a132daf59.

Incorrect interpretation of intent - the uint arg is a netmask
so should be 32 bits
---

diff --git a/src/lib/util/calc.c b/src/lib/util/calc.c
index ea7ce180626..9b0246b980d 100644
--- a/src/lib/util/calc.c
+++ b/src/lib/util/calc.c
@@ -79,8 +79,6 @@ static const fr_type_t upcast_op[FR_TYPE_MAX + 1][FR_TYPE_MAX + 1] = {
 		/*
 		 *	ipaddr + int --> prefix (generally only "and")
 		 */
-		[FR_TYPE_UINT8]  =  FR_TYPE_IPV4_PREFIX,
-		[FR_TYPE_UINT16] =  FR_TYPE_IPV4_PREFIX,
 		[FR_TYPE_UINT32] =  FR_TYPE_IPV4_PREFIX,
 
 		/*