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 008a84749af462d5006950651751bbf929b89464..f6ac9d3cc19181bfe628cc0aeb7de3f1642cf20e 100644 (file)
--- 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 */