From 62c8590d2eac69f5718686abe541a06bcb930d10 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Mon, 2 Sep 2024 07:08:26 -0400 Subject: [PATCH] set_leaf_da() should also set leaf filter --- src/lib/server/map.c | 1 - src/lib/server/tmpl_tokenize.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/server/map.c b/src/lib/server/map.c index 7842d6b9dc..7d9c49a868 100644 --- a/src/lib/server/map.c +++ b/src/lib/server/map.c @@ -1368,7 +1368,6 @@ int map_afrom_vp(TALLOC_CTX *ctx, map_t **out, fr_pair_t *vp, tmpl_rules_t const if (!map->lhs) goto oom; tmpl_attr_set_leaf_da(map->lhs, vp->da); - tmpl_attr_set_leaf_num(map->lhs, NUM_UNSPEC); tmpl_attr_set_request_ref(map->lhs, rules->attr.request_def); tmpl_attr_set_list(map->lhs, rules->attr.list_def); diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c index dfe6d48677..cf6805f1a0 100644 --- a/src/lib/server/tmpl_tokenize.c +++ b/src/lib/server/tmpl_tokenize.c @@ -1158,10 +1158,13 @@ int tmpl_attr_set_leaf_da(tmpl_t *vpt, fr_dict_attr_t const *da) ref->type = TMPL_ATTR_TYPE_NORMAL; ref->da = da; } + /* * FIXME - Should be calculated from existing ar */ ref->ar_parent = fr_dict_root(fr_dict_by_da(da)); /* Parent is the root of the dictionary */ + ref->ar_filter_type = TMPL_ATTR_FILTER_TYPE_NONE; + ref->ar_num = NUM_UNSPEC; TMPL_ATTR_VERIFY(vpt); -- 2.47.2