once again remove tmpl_tokenize_all_nested

FreeRADIUS · Sep 18, 2023 · b8b3f8c · b8b3f8c
1 parent 05e3d07
commit b8b3f8c
Show file tree

Hide file tree

Showing 19 changed files with 7 additions and 103 deletions.
diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
@@ -597,12 +597,6 @@ global {
 #  `-S flag=value`.
 #
 migrate {
-	#
-	#  tmpl_tokenize_all_nested:: Create all internal "tmpl" data
-	#  structures as using nested structures instead of flat ones.
-	#
-	tmpl_tokenize_all_nested = false
-
 	#
 	#  rewrite_update:: Rewrite old `update` sections to use the new
 	#  "edit" code.

diff --git a/src/lib/server/main_config.c b/src/lib/server/main_config.c
@@ -188,7 +188,6 @@ static const CONF_PARSER thread_config[] = {
  *	Migration configuration.
  */
 static const CONF_PARSER migrate_config[] = {
-	{ FR_CONF_OFFSET("tmpl_tokenize_all_nested", FR_TYPE_BOOL | FR_TYPE_HIDDEN, main_config_t, tmpl_tokenize_all_nested) },
 	{ FR_CONF_OFFSET("rewrite_update", FR_TYPE_BOOL | FR_TYPE_HIDDEN, main_config_t, rewrite_update) },
 	{ FR_CONF_OFFSET("forbid_update", FR_TYPE_BOOL | FR_TYPE_HIDDEN, main_config_t, forbid_update) },
 
@@ -1474,7 +1473,6 @@ void main_config_hup(main_config_t *config)
 }
 
 static fr_table_num_ordered_t config_arg_table[] = {
-	{ L("tmpl_tokenize_all_nested"), offsetof(main_config_t, tmpl_tokenize_all_nested) },
 	{ L("rewrite_update"),		 offsetof(main_config_t, rewrite_update) },
 	{ L("forbid_update"),		 offsetof(main_config_t, forbid_update) },
 };

diff --git a/src/lib/server/main_config.h b/src/lib/server/main_config.h
@@ -159,7 +159,6 @@ struct main_config_s {
 	/*
 	 *	Migration tools
 	 */
-	bool		tmpl_tokenize_all_nested;      	//!< tmpl_tokenize will create nested tmpls instead of flat ones
 	bool		rewrite_update;			//!< rewrite "update" to be new edit sections
 	bool		forbid_update;			//!< forbid "update" sections
 };

diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c
@@ -1916,34 +1916,9 @@ static inline int tmpl_attr_afrom_attr_substr(TALLOC_CTX *ctx, tmpl_attr_error_t
 		case FR_TYPE_VSA:
 		is_union:
 			/*
-			 *	Omit nesting types where the relationship is already
-			 *	described by the dictionaries and there's no filter.
-			 *
-			 *	These attribute references would just use additional
-			 *	memory for no real purpose.
-			 *
-			 *	Because we pre-allocate an attribute reference in
-			 *	each tmpl talloc pool, unless the attribute
-			 *	reference list contains a group, there's no performance
-			 *	penalty in repeatedly allocating and freeing this ar.
-			 *
-			 *	Flatten / nested migration hack. :(
-			 */
-//			if (main_config && main_config->tmpl_tokenize_all_nested) {
-			if (1) {
-				our_parent = da;	/* Only update the parent if we're not stripping */
-
-			} else if (ar_filter_is_none(ar) && ar_is_normal(ar)) {
-				TALLOC_FREE(ar);
-			} else {
-				our_parent = da;	/* Only update the parent if we're not stripping */
-			}
-
-			/*
-			 *	The child might not go into the parent list, but the child definitely is in
-			 *	the parents namespace.
+			 *	Structural types are parented and namespaced from their parent da.
 			 */
-			namespace = da;
+			namespace = our_parent = da;
 			break;
 
 		default:

diff --git a/src/tests/auth/unit_test_module.conf b/src/tests/auth/unit_test_module.conf
@@ -13,10 +13,6 @@ security {
 	allow_vulnerable_openssl = yes
 }
 
-migrate {
-	tmpl_tokenize_all_nested = true
-}
-
 modules {
 	$INCLUDE ${raddb}/mods-enabled/always
 

diff --git a/src/tests/digest/config/digest.conf b/src/tests/digest/config/digest.conf
@@ -29,10 +29,6 @@ security {
 	allow_vulnerable_openssl = yes
 }
 
-migrate {
-	tmpl_tokenize_all_nested = true
-}
-
 policy {
 	files.authorize {
 		if (&User-Name == "bob") {

diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk
@@ -78,10 +78,10 @@ ifneq "$(findstring ${1}, update-to-edit $(KEYWORD_UPDATE_TESTS) xlat-unknown )"
 $(OUTPUT)/${1}: NEW_COND=
 
 else ifneq "$(findstring ${1}, $(KEYWORD_UPDATE_REWRITE_TESTS))" ""
-$(OUTPUT)/${1}: NEW_COND=-S rewrite_update=yes -S tmpl_tokenize_all_nested=yes
+$(OUTPUT)/${1}: NEW_COND=-S rewrite_update=yes
 
 else
-$(OUTPUT)/${1}: NEW_COND=-S forbid_update=yes -S tmpl_tokenize_all_nested=yes
+$(OUTPUT)/${1}: NEW_COND=-S forbid_update=yes
 
 ifeq "${1}" "mschap"
 $(OUTPUT)/${1}: $(BUILD_DIR)/lib/local/rlm_mschap.la $(BUILD_DIR)/lib/rlm_mschap.la

diff --git a/src/tests/keywords/pairs b/src/tests/keywords/pairs
@@ -32,10 +32,9 @@ if !(&Tmp-String-3 == 'Tmp-String-0 = "This is a string", Tmp-String-0 = "This i
 }
 
 #
-#  Allow old-style, and with -S tmpl_tokenize_all_nested=yes
+#  Must be nested
 #
-if !((&Tmp-String-4 == 'Password.Cleartext = "hello"') ||
-     (&Tmp-String-4 == 'Password = { Cleartext = "hello" }')) {
+if !(&Tmp-String-4 == 'Password = { Cleartext = "hello" }') {
 	test_fail
 }
 

diff --git a/src/tests/ldap_sync/active_directory/config/radiusd.conf b/src/tests/ldap_sync/active_directory/config/radiusd.conf
@@ -29,11 +29,6 @@ security {
 	allow_vulnerable_openssl = yes
 }
 
-#  Only during migration
-migrate {
-	tmpl_tokenize_all_nested = yes
-}
-
 global {
 	ldap {
 		ldap_debug = 0x0801

diff --git a/src/tests/ldap_sync/persistent_search/config/radiusd.conf b/src/tests/ldap_sync/persistent_search/config/radiusd.conf
@@ -29,11 +29,6 @@ security {
 	allow_vulnerable_openssl = yes
 }
 
-#  Only during migration
-migrate {
-	tmpl_tokenize_all_nested = yes
-}
-
 global {
 	ldap {
 		ldap_debug = 0x0801

diff --git a/src/tests/ldap_sync/rfc4533/config/radiusd.conf b/src/tests/ldap_sync/rfc4533/config/radiusd.conf
@@ -29,11 +29,6 @@ security {
 	allow_vulnerable_openssl = yes
 }
 
-#  Only during migration
-migrate {
-	tmpl_tokenize_all_nested = yes
-}
-
 global {
 	ldap {
 		ldap_debug = 0x0801

diff --git a/src/tests/modules/imap/imap_opt_tls/global.conf b/src/tests/modules/imap/imap_opt_tls/global.conf
@@ -1,5 +0,0 @@
-# Needed during migration to nested attributes
-# to check TLS-Certificate.Issuer
-migrate {
-	tmpl_tokenize_all_nested = yes
-}

diff --git a/src/tests/modules/imap/imap_tls/global.conf b/src/tests/modules/imap/imap_tls/global.conf
@@ -1,5 +0,0 @@
-# Needed during migration to nested attributes
-# to check TLS-Certificate.Issuer
-migrate {
-	tmpl_tokenize_all_nested = yes
-}

diff --git a/src/tests/modules/migrate.conf b/src/tests/modules/migrate.conf
diff --git a/src/tests/modules/smtp/smtp_authenticate/global.conf b/src/tests/modules/smtp/smtp_authenticate/global.conf
@@ -1,5 +0,0 @@
-# Needed during migration to nested attributes
-# to check TLS-Certificate.Issuer
-migrate {
-	tmpl_tokenize_all_nested = yes
-}

diff --git a/src/tests/modules/smtp/smtp_crln/global.conf b/src/tests/modules/smtp/smtp_crln/global.conf
@@ -1,5 +0,0 @@
-# Needed during migration to nested attributes
-# to check TLS-Certificate.Issuer
-migrate {
-	tmpl_tokenize_all_nested = yes
-}

diff --git a/src/tests/modules/smtp/smtp_stringparse/global.conf b/src/tests/modules/smtp/smtp_stringparse/global.conf
@@ -1,5 +0,0 @@
-# Needed during migration to nested attributes
-# to check TLS-Certificate.Issuer
-migrate {
-	tmpl_tokenize_all_nested = yes
-}

diff --git a/src/tests/modules/unit_test_module.conf b/src/tests/modules/unit_test_module.conf
@@ -1,4 +1,4 @@
-#
+>#
 #  Minimal radiusd.conf for testing modules
 #
 
@@ -12,11 +12,6 @@ security {
 	allow_vulnerable_openssl = yes
 }
 
-migrate {
-	tmpl_tokenize_all_nested = true
-	forbid_update = true
-}
-
 delete_from_radacct = "DELETE FROM radcheck WHERE AcctSessionId ="
 delete_from_radcheck = "DELETE FROM radcheck WHERE username ="
 delete_from_radreply = "DELETE FROM radreply WHERE username ="

diff --git a/src/tests/xlat/unit_test_module.conf b/src/tests/xlat/unit_test_module.conf
@@ -13,10 +13,6 @@ security {
     allow_core_dumps = yes
 }
 
-migrate {
-	tmpl_tokenize_all_nested = true
-}
-
 modules {
 	$INCLUDE ${raddb}/mods-enabled/always