From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 13 May 2019 20:19:18 +0000 (-0400)
Subject: dictionaries no longer need protocol-specific hacks
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=633deebdaab6e66aeb97486a1afb8df2d8ab51b4;p=thirdparty%2Ffreeradius-server.git

dictionaries no longer need protocol-specific hacks
---

diff --git a/src/lib/util/dict.c b/src/lib/util/dict.c
index 265f2cf5225..15165616016 100644
--- a/src/lib/util/dict.c
+++ b/src/lib/util/dict.c
@@ -24,12 +24,7 @@ RCSID("$Id$")
 
 #include "dict.h"
 
-#ifdef WITH_DHCP
-#  include <freeradius-devel/dhcpv4/dhcpv4.h>
-#endif
 #include <freeradius-devel/radius/defs.h>
-#include <freeradius-devel/radius/radius.h>
-#include <freeradius-devel/protocol/radius/rfc2865.h>
 #include <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/hash.h>
 #include <freeradius-devel/util/misc.h>
@@ -524,8 +519,7 @@ static bool dict_attr_fields_valid(fr_dict_t *dict, fr_dict_attr_t const *parent
 	 *	the appropriate flags set for attributes in this
 	 *	space.
 	 */
-	if ((*attr > UINT8_MAX) && !flags->internal &&
-	    !((strncmp("VMPS", name, 4) == 0) || (strncmp("VQP", name, 3) == 0))) {	/* Fixme */
+	if ((*attr > UINT8_MAX) && !flags->internal) {
 		for (v = parent; v != NULL; v = v->parent) {
 			if ((v->type == FR_TYPE_TLV) || (v->type == FR_TYPE_VENDOR)) {
 				if ((v->flags.type_size < 4) &&