Add null to the type table so we can print it correctly

Don't add cast attribute for "null"

diff --git a/src/lib/util/dict_tokenize.c b/src/lib/util/dict_tokenize.c
index faf6eb98e76c2f3ac8f00a5e5a9caa938aa7f52c..5396f2743f4e45b27beb2d99d1f8124d6a465db2 100644 (file)
--- a/src/lib/util/dict_tokenize.c
+++ b/src/lib/util/dict_tokenize.c
@@ -2581,7 +2581,11 @@ int fr_dict_internal_afrom_file(fr_dict_t **out, char const *dict_subdir, char c
                fr_dict_attr_t                  *n;
                fr_table_num_ordered_t const    *p = &fr_value_box_type_table[i];
 
-               if (p->value == FR_TYPE_VENDOR) continue;       /* These can't exist in the root */
+               switch (p->value) {
+               case FR_TYPE_NULL:      /* Can't cast to NULL */
+               case FR_TYPE_VENDOR:    /* Vendors can't exist in dictionaries as attributes */
+                       continue;
+               }
 
                type_name = talloc_typed_asprintf(NULL, "Tmp-Cast-%s", p->name.str);
 

diff --git a/src/lib/util/value.c b/src/lib/util/value.c
index 228583506b8a9cb68e78d5c70ab7e7c784970426..175323012aef7e0246c117688be6fdc1767067bf 100644 (file)
--- a/src/lib/util/value.c
+++ b/src/lib/util/value.c
@@ -102,6 +102,7 @@ static_assert(SIZEOF_MEMBER(fr_value_box_t, vb_float64) == 8,
 /** Map data types to names representing those types
  */
 fr_table_num_ordered_t const fr_value_box_type_table[] = {
+       { L("null"),            FR_TYPE_NULL            },
        { L("string"),          FR_TYPE_STRING          },
        { L("octets"),          FR_TYPE_OCTETS          },