From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 24 Nov 2025 01:33:02 +0000 (-0500)
Subject: remove hacks for key fields
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12f51b16e2f27993eccadfa77faea0d0d84cd51b;p=thirdparty%2Ffreeradius-server.git

remove hacks for key fields
---

diff --git a/src/lib/server/tmpl_eval.c b/src/lib/server/tmpl_eval.c
index 2cd598501f1..a7571286b7d 100644
--- a/src/lib/server/tmpl_eval.c
+++ b/src/lib/server/tmpl_eval.c
@@ -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
 		 */