From: Alan T. DeKok Date: Wed, 27 Jul 2022 18:07:16 +0000 (-0400) Subject: just resolve entire LHS if required X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bd4e84e314e14ad6d2268a5ce2077ef2ce4a491;p=thirdparty%2Ffreeradius-server.git just resolve entire LHS if required --- diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c index 0a2f74d9c6f..00ee8a2bad6 100644 --- a/src/lib/unlang/compile.c +++ b/src/lib/unlang/compile.c @@ -536,31 +536,12 @@ static bool pass2_fixup_map(map_t *map, tmpl_rules_t const *rules, fr_dict_attr_ { RULES_VERIFY(rules); - if (tmpl_is_xlat_unresolved(map->lhs)) { - fr_assert(tmpl_xlat(map->lhs) == NULL); - - /* - * FIXME: compile to attribute && handle - * the conversion in map_to_vp(). - */ + if (tmpl_is_unresolved(map->lhs)) { if (!pass2_fixup_tmpl(map, &map->lhs, map->ci, rules->attr.dict_def)) { return false; } } - if (tmpl_is_exec(map->lhs)) { - if (!pass2_fixup_tmpl(map, &map->lhs, map->ci, rules->attr.dict_def)) { - return false; - } - } - - /* - * Deal with undefined attributes now. - */ - if (tmpl_is_attr_unresolved(map->lhs)) { - if (!pass2_fixup_tmpl(map, &map->lhs, map->ci, rules->attr.dict_def)) return false; - } - /* * Enforce parent-child relationships in nested maps. */