]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
smash previous value
authorAlan T. DeKok <aland@freeradius.org>
Fri, 1 Nov 2019 19:24:11 +0000 (15:24 -0400)
committerAlan T. DeKok <aland@freeradius.org>
Fri, 1 Nov 2019 19:24:11 +0000 (15:24 -0400)
src/lib/util/dict_tokenize.c

index 4efad66ac7cf3e7f28664f40ff418d205809cffb..972b5a3d06ee09624d471354d5c05fa1b7d1e0f6 100644 (file)
@@ -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) {