clean up uses of DEFINE

don't add DEFINEs to "child by num" array, as no one should ever
know about the numbers.

Don't set the "internal" flag for string-based attributes.

diff --git a/src/lib/util/dict_util.c b/src/lib/util/dict_util.c
index dea61d76533adad92e9a369c8b4f45642e0a326b..a0182fecf19b95ecdec5d163f07a1f46bac9f91c 100644 (file)
--- a/src/lib/util/dict_util.c
+++ b/src/lib/util/dict_util.c
@@ -1076,6 +1076,12 @@ int dict_attr_child_add(fr_dict_attr_t *parent, fr_dict_attr_t *child)
                return -1;
        }
 
+       /*
+        *      The parent has children by name only, not by number.  Don't even bother trying to track
+        *      numbers.
+        */
+       if (parent->flags.name_only) return 0;
+
        /*
         *      We only allocate the pointer array *if* the parent has children.
         */

diff --git a/src/lib/util/dict_validate.c b/src/lib/util/dict_validate.c
index 9a0ab84b44066936093161dab7d87700c686251d..da8b83a79c376db2f107e0edaa6dba30ef40ae62 100644 (file)
--- a/src/lib/util/dict_validate.c
+++ b/src/lib/util/dict_validate.c
@@ -654,8 +654,12 @@ bool dict_attr_fields_valid(fr_dict_t *dict, fr_dict_attr_t const *parent,
         *      is.
         */
        if (*attr == -1) {
-
-               flags->internal = 1;
+               /*
+                *      If we don't care about the number, then this attribute is almost always
+                *      an internal one.  Unless it's a "name only" attribute for string-based
+                *      protocols.
+                */
+               flags->internal |= !flags->name_only;
 
                v = fr_dict_attr_by_name(NULL, fr_dict_root(dict), name);
                if (v) {