move more logic into tmpl_resolve()

diff --git a/src/lib/server/tmpl.h b/src/lib/server/tmpl.h
index 7e94fec0286e48041795720a99280827421276a8..c99de40d649684604f1c0b4b54bc85cb0ff83a39 100644 (file)
--- a/src/lib/server/tmpl.h
+++ b/src/lib/server/tmpl.h
@@ -363,6 +363,8 @@ struct tmpl_res_rules_s {
 
        bool                    force_dict_def;         //!< Use supplied dict_def even if original
                                                        ///< vpt->rules->dict_def was not NULL.
+
+       fr_dict_attr_t const    *enumv;                 //!< for resolving T_BARE_WORD
 };
 
 typedef enum {

diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c
index 6fb986536d3fb17808a8aa3688f5372e52e41bf7..8ee1d746cc9596a59c0cf30820b574914fb3c4bb 100644 (file)
--- a/src/lib/server/tmpl_tokenize.c
+++ b/src/lib/server/tmpl_tokenize.c
@@ -2702,6 +2702,9 @@ ssize_t tmpl_afrom_substr(TALLOC_CTX *ctx, tmpl_t **out,
                        return fr_sbuff_set(in, &our_in);
                }
 
+               DEBUG2("TMPL_TOKENIZE <-- %pV", fr_box_strvalue_len(fr_sbuff_current(in), fr_sbuff_remaining(in)));
+
+
                /*
                 *      Deal with explicit casts...
                 */
@@ -3595,11 +3598,21 @@ int tmpl_resolve(tmpl_t *vpt, tmpl_res_rules_t const *tr_rules)
 
        if (!tr_rules) tr_rules = &default_tr_rules;
 
+       /*
+        *      We may now know the correct dictionary
+        *      where we didn't before...
+        */
+       if (!vpt->rules.attr.dict_def) tmpl_set_dict_def(vpt, tr_rules->dict_def);
+
        /*
         *      The xlat component of the #tmpl_t needs resolving.
+        *
+        *      This includes exec tmpls, which are largely xlats
+        *      "under the hood".
         */
        if (tmpl_contains_xlat(vpt)) {
                ret = tmpl_xlat_resolve(vpt, tr_rules);
+
        /*
         *      The attribute reference needs resolving.
         */
@@ -3607,14 +3620,32 @@ int tmpl_resolve(tmpl_t *vpt, tmpl_res_rules_t const *tr_rules)
                ret = tmpl_attr_resolve(vpt, tr_rules);
 
        /*
-        *      Convert unresolved tmpls into literal string values.
+        *      Convert unresolved tmpls int enumvs, or failing that, string values.
         */
-       } else if (tmpl_is_unresolved(vpt)) {
+       } else {
                fr_type_t dst_type = tmpl_rules_cast(vpt);
+               fr_dict_attr_t const *enumv = tmpl_rules_enumv(vpt);
 
-               if (fr_type_is_null(dst_type)) dst_type = FR_TYPE_STRING;       /* Default to strings */
+               fr_assert(tmpl_is_unresolved(vpt));
+
+               if (fr_type_is_null(dst_type)) {
+                       if (!enumv) enumv = tr_rules->enumv;
+
+                       if (enumv) {                            
+                               dst_type = enumv->type;
+                       } else {
+                               dst_type = FR_TYPE_STRING;      /* Default to strings */
+                       }
+               } else {
+                       /*
+                        *      If there is a cast, then we parse the
+                        *      tmpl according to the cast.  Otherwise
+                        *      we would need to parse it as the
+                        *      enumv, and then cast it?
+                        */
+               }
 
-               if (tmpl_cast_in_place(vpt, dst_type, NULL) < 0) return -1;
+               if (tmpl_cast_in_place(vpt, dst_type, enumv) < 0) return -1;
 
                TMPL_VERIFY(vpt);
        }