From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 1 Nov 2019 19:24:11 +0000 (-0400)
Subject: smash previous value
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f92efb6d6deb932fd365ebdd4c6bfda37a8297d0;p=thirdparty%2Ffreeradius-server.git

smash previous value
---

diff --git a/src/lib/util/dict_tokenize.c b/src/lib/util/dict_tokenize.c
index 4efad66ac7c..972b5a3d06e 100644
--- a/src/lib/util/dict_tokenize.c
+++ b/src/lib/util/dict_tokenize.c
@@ -1229,7 +1229,6 @@ static int dict_read_process_protocol(char **argv, int argc)
 	 */
 	if (dict) {
 		if (type_size && (dict->root->flags.type_size != type_size)) {
-		conflicting:
 			fr_strerror_printf("Conflicting flags for PROTOCOL \"%s\" (current %d versus new %d)",
 					   dict->root->name, dict->root->flags.type_size, type_size);
 			return -1;
@@ -1246,11 +1245,6 @@ static int dict_read_process_protocol(char **argv, int argc)
 
 	if (dict_protocol_add(dict) < 0) return -1;
 
-	/*
-	 *	Set the type size
-	 */
-	if (type_size && (dict->root->flags.type_size != type_size)) goto conflicting;
-
 	memcpy(&mutable, &dict->root, sizeof(mutable));
 
 	if (!type_size) {