From: Alan T. DeKok <aland@freeradius.org>
Date: Sat, 20 Aug 2022 13:06:33 +0000 (-0400)
Subject: temporary migration tools
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63f800edf2dbdeebd55e30e1608231e1d4d1f9cf;p=thirdparty%2Ffreeradius-server.git

temporary migration tools

where we can enable / disable flatten / nested pairs at run time.
---

diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c
index 008a84749af..f6ac9d3cc19 100644
--- a/src/lib/server/tmpl_tokenize.c
+++ b/src/lib/server/tmpl_tokenize.c
@@ -1877,7 +1877,10 @@ do_suffix:
 			 *
 			 *	Flatten / nested migration hack. :(
 			 */
-			if ((main_config && main_config->tmpl_tokenize_all_nested) || ((filter == TMPL_ATTR_REF_NO_FILTER) && (ar->type == TMPL_ATTR_TYPE_NORMAL))) {
+			if (main_config && main_config->tmpl_tokenize_all_nested) {
+				our_parent = da;	/* Only update the parent if we're not stripping */
+
+			} else if ((filter == TMPL_ATTR_REF_NO_FILTER) && (ar->type == TMPL_ATTR_TYPE_NORMAL)) {
 				TALLOC_FREE(ar);
 			} else {
 				our_parent = da;	/* Only update the parent if we're not stripping */