when parsing attributes by number, use the real protocol dictionary

and not the non-local one.

diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c
index a448be81d852ea40973e760dd57ab706f20cc66f..192744e22b0ac5068ab44b7166ee586f91f7db00 100644 (file)
--- a/src/lib/server/tmpl_tokenize.c
+++ b/src/lib/server/tmpl_tokenize.c
@@ -1939,6 +1939,8 @@ static inline int tmpl_attr_afrom_attr_substr(TALLOC_CTX *ctx, tmpl_attr_error_t
         *      .<oid>
         */
        if (fr_sbuff_out(NULL, &oid, name) > 0) {
+               namespace = fr_dict_unlocal(namespace);
+
                fr_strerror_clear();    /* Clear out any existing errors */
 
                if (fr_dict_by_da(namespace) == fr_dict_internal()) goto disallow_unknown;

diff --git a/src/lib/util/dict.h b/src/lib/util/dict.h
index 31558b68ea29bbfca5f56004594d61c07abb4809..0488c783e2762fe069bc7bd8e1abb40f3641cc96 100644 (file)
--- a/src/lib/util/dict.h
+++ b/src/lib/util/dict.h
@@ -564,6 +564,8 @@ fr_dict_t const             *fr_dict_by_protocol_num(unsigned int num);
 
 fr_dict_protocol_t const *fr_dict_protocol(fr_dict_t const *dict);
 
+fr_dict_attr_t const   *fr_dict_unlocal(fr_dict_attr_t const *da) CC_HINT(nonnull);
+
 fr_dict_t const                *fr_dict_by_da(fr_dict_attr_t const *da) CC_HINT(nonnull);
 
 fr_dict_t const                *fr_dict_by_attr_name(fr_dict_attr_t const **found, char const *name);

diff --git a/src/lib/util/dict_util.c b/src/lib/util/dict_util.c
index ee34d25c0ba55e34c157f6b7a90fbd397cd46aff..38f00e373bcf1871a9f7ada4d6f08007835da915 100644 (file)
--- a/src/lib/util/dict_util.c
+++ b/src/lib/util/dict_util.c
@@ -4587,3 +4587,19 @@ fr_dict_protocol_t const *fr_dict_protocol(fr_dict_t const *dict)
 {
        return dict->proto;
 }
+
+/*
+ *     Get the real protocol dictionary behind the local one.
+ */
+fr_dict_attr_t const *fr_dict_unlocal(fr_dict_attr_t const *da)
+{
+       if (!da->flags.local) return da;
+
+       fr_assert(da->dict->root == da);
+
+       while (da->dict->next) {
+               da = da->dict->next->root;
+       }
+
+       return da;
+}