]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
remove hacks for key fields
authorAlan T. DeKok <aland@freeradius.org>
Mon, 24 Nov 2025 01:33:02 +0000 (20:33 -0500)
committerAlan T. DeKok <aland@freeradius.org>
Mon, 24 Nov 2025 01:33:02 +0000 (20:33 -0500)
src/lib/server/tmpl_eval.c

index 2cd598501f1159f37e6ef42653e7a247d78db5a5..a7571286b7d62a69971afa3e50e782a147ec693e 100644 (file)
@@ -883,23 +883,8 @@ int pair_append_by_tmpl_parent(TALLOC_CTX *ctx, fr_pair_t **out, fr_pair_list_t
                 */
                if (ar != leaf) {
                        vp = fr_pair_find_by_da(list, NULL, ar->da);
-                       /*
-                        *      HACK - Pretend we didn't see this stupid key field
-                        *
-                        *      If we don't have this, the code creates a key pair
-                        *      and then horribly mangles its data by adding children
-                        *      to it.
-                        *
-                        *      We just skip one level down an don't create or update
-                        *      the key pair.
-                        *
-                        *      @todo - remove after migration_union_key is deleted
-                        */
-                       if (vp && fr_dict_attr_is_key_field(ar->da) && fr_type_is_leaf(vp->data.type)) {
-                               ar = tmpl_attr_list_next(ar_list, ar);
-                               continue;
-                       }
                }
+
                /*
                 *      Nothing found, create the pair
                 */