]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
just resolve entire LHS if required
authorAlan T. DeKok <aland@freeradius.org>
Wed, 27 Jul 2022 18:07:16 +0000 (14:07 -0400)
committerAlan T. DeKok <aland@freeradius.org>
Wed, 27 Jul 2022 18:07:16 +0000 (14:07 -0400)
src/lib/unlang/compile.c

index 0a2f74d9c6f90b0b5a6f99fde1c1d5f67c1eedb2..00ee8a2bad69b1354abd171c2f1a3671563f8bf2 100644 (file)
@@ -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.
         */