allow dict to be NULL when setting the function

if so, also set needs_resolving.

Because an xlat can be parsed from a module configuration, where
the dictionary is unknown.  Until such time as all of the modules
are converted to use call_env, this is likely the best approach.

diff --git a/src/lib/unlang/xlat_alloc.c b/src/lib/unlang/xlat_alloc.c
index 2292d0b824e31b3e80fc9056357b99cf1f2e6015..fa20c5fee00fccf54d39bbe8fd0d7bb95ed0fd04 100644 (file)
--- a/src/lib/unlang/xlat_alloc.c
+++ b/src/lib/unlang/xlat_alloc.c
@@ -280,6 +280,8 @@ void xlat_exp_set_func(xlat_exp_t *node, xlat_t const *func, fr_dict_t const *di
        node->call.dict = dict;
        node->flags = func->flags;
        node->flags.impure_func = !func->flags.pure;
+
+       if (!dict) node->flags.needs_resolving = true;
 }
 
 void xlat_exp_finalize_func(xlat_exp_t *node)

diff --git a/src/lib/unlang/xlat_priv.h b/src/lib/unlang/xlat_priv.h
index 6672c51bf8b9a4c5bc22219170586ad06600897e..82151f5989555fdb1e35c05e303cae78475c1e49 100644 (file)
--- a/src/lib/unlang/xlat_priv.h
+++ b/src/lib/unlang/xlat_priv.h
@@ -283,7 +283,7 @@ void                xlat_exp_set_name_shallow(xlat_exp_t *node, char const *fmt) CC_HINT(nonnu
 void           xlat_exp_set_name_buffer(xlat_exp_t *node, char const *fmt) CC_HINT(nonnull);
 
 void           xlat_exp_set_vpt(xlat_exp_t *node, tmpl_t *vpt) CC_HINT(nonnull);
-void           xlat_exp_set_func(xlat_exp_t *node, xlat_t const *func, fr_dict_t const *dict) CC_HINT(nonnull);
+void           xlat_exp_set_func(xlat_exp_t *node, xlat_t const *func, fr_dict_t const *dict) CC_HINT(nonnull(1,2));
 void           xlat_exp_finalize_func(xlat_exp_t *node) CC_HINT(nonnull);
 
 /*