we can't set da->type until later, or else things complain

diff --git a/src/lib/util/dict.h b/src/lib/util/dict.h
index 193a05ea2beec01e15785136768e4e81ff19653f..649383de7914cdc32d310fe24fc4454bac745895 100644 (file)
--- a/src/lib/util/dict.h
+++ b/src/lib/util/dict.h
@@ -304,7 +304,7 @@ typedef enum {
 } fr_dict_attr_err_t;
 
 typedef bool (*fr_dict_attr_valid_func_t)(fr_dict_attr_t *da);
-typedef bool (*fr_dict_attr_type_parse_t)(fr_dict_attr_t **da_p, char const *name);
+typedef bool (*fr_dict_attr_type_parse_t)(fr_type_t *type, fr_dict_attr_t **da_p, char const *name);
 
 /*
  *     Forward declarations to avoid circular references.

diff --git a/src/lib/util/dict_tokenize.c b/src/lib/util/dict_tokenize.c
index c9d3874374655282c65194bdab84cdc663e2aed3..88e49c2cc1d963a8a80f55f226964e15cc40eec6 100644 (file)
--- a/src/lib/util/dict_tokenize.c
+++ b/src/lib/util/dict_tokenize.c
@@ -440,12 +440,10 @@ static int dict_process_type_field(dict_tokenize_ctx_t *dctx, char const *name,
                        return -1;
                }
 
-               if (!dctx->dict->proto->attr.type_parse(da_p, name)) {
+               if (!dctx->dict->proto->attr.type_parse(&type, da_p, name)) {
                        return -1;
                }
 
-               type = (*da_p)->type;
-
                fr_assert(!fr_type_is_null(type));
        }