remove pair_legacy_nested

diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index 71f03be20919f876618521b340180ed0aba90b18..508c9c48c8b9591c42ac4d56217d29e93ffcfd22 100644 (file)
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in
@@ -603,14 +603,6 @@ migrate {
        #
        tmpl_tokenize_all_nested = false
 
-       #
-       #  pair_legacy_nested: make legacy APIs return nested attributes
-       #
-       #  e.g. the `detail` file, `exec` commands, along with the
-       #  `cron`, and `load` listeners.
-       #
-       pair_legacy_nested = false
-
        #
        #  rewrite_update:: Rewrite old `update` sections to use the new
        #  "edit" code.

diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c
index 5031b064b5c8bd07712dc2b9ffce8946e26dfee7..1dde7a09ceaa8e250e531d5724839013e5fd3ea4 100644 (file)
--- a/src/bin/unit_test_attribute.c
+++ b/src/bin/unit_test_attribute.c
@@ -2269,9 +2269,9 @@ static size_t command_migrate(command_result_t *result, UNUSED command_file_ctx_
        fr_skip_whitespace(in);
        p = in;
 
-       if (strncmp(p, "pair_legacy_nested", sizeof("pair_legacy_nested") - 1) == 0) {
-               p += sizeof("pair_legacy_nested") - 1;
-               out = &fr_pair_legacy_nested;
+       if (strncmp(p, "pair_legacy_print_nested", sizeof("pair_legacy_print_nested") - 1) == 0) {
+               p += sizeof("pair_legacy_print_nested") - 1;
+               out = &fr_pair_legacy_print_nested;
 
        } else {
                fr_strerror_const("Unknown migration flag");
@@ -3639,8 +3639,6 @@ int main(int argc, char *argv[])
                goto cleanup;
        }
 
-       fr_pair_legacy_nested = true; /* force migration flags */
-
        if (receipt_file && (fr_unlink(receipt_file) < 0)) {
                fr_perror("unit_test_attribute");
                EXIT_WITH_FAILURE;

diff --git a/src/lib/server/main_config.c b/src/lib/server/main_config.c
index 3712556b81f164b0e0f07c4c6d2523458f04565f..7819ae8fd6e58f294c21d4a8e98783c3d9481250 100644 (file)
--- a/src/lib/server/main_config.c
+++ b/src/lib/server/main_config.c
@@ -191,7 +191,6 @@ 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) },
-       { FR_CONF_POINTER("pair_legacy_nested", FR_TYPE_BOOL | FR_TYPE_HIDDEN, &fr_pair_legacy_nested), },
 
        CONF_PARSER_TERMINATOR
 };
@@ -1502,9 +1501,6 @@ int main_config_parse_option(char const *value)
        if (offset) {
                out = (bool *) (((uintptr_t) main_config) + offset);
 
-       } else if (strncmp(p, "pair_legacy_nested", p - value) != 0) {
-               out = &fr_pair_legacy_nested;
-
        } else {
                return -1;
        }
@@ -1534,8 +1530,6 @@ bool main_config_migrate_option_get(char const *name)
 
        if (strcmp(name, "use_new_conditions") == 0) return true; /* ignore this for migration */
 
-       if (strcmp(name, "pair_legacy_nested") == 0) return fr_pair_legacy_nested;
-
        offset = fr_table_value_by_substr(config_arg_table, name, strlen(name), 0);
        if (!offset) return false;
 

diff --git a/src/lib/util/pair_legacy.c b/src/lib/util/pair_legacy.c
index 0b56761962d3679066675831b84ea80e733ae25b..ee9a8cd15b3476beb482a2de53773d5c677fefdf 100644 (file)
--- a/src/lib/util/pair_legacy.c
+++ b/src/lib/util/pair_legacy.c
@@ -32,7 +32,6 @@ RCSID("$Id$")
 #include <freeradius-devel/protocol/radius/rfc2865.h>
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
-bool fr_pair_legacy_nested = true;
 bool fr_pair_legacy_print_nested = false;
 
 static fr_sbuff_term_t const   bareword_terminals =
@@ -263,7 +262,7 @@ static ssize_t fr_pair_list_afrom_substr(TALLOC_CTX *ctx, fr_dict_attr_t const *
 
                fr_skip_whitespace(p);
 
-               if (!fr_pair_legacy_nested || parent_vp || (*relative_vp && ((*relative_vp)->da == da->parent)))  {
+               if (parent_vp || (*relative_vp && ((*relative_vp)->da == da->parent)))  {
                        vp = fr_pair_afrom_da(my_ctx, da);
                        if (!vp) goto error;
                        fr_pair_append(my_list, vp);

diff --git a/src/lib/util/pair_legacy.h b/src/lib/util/pair_legacy.h
index f0354377e91c8d645e3070cde99a81de5513a405..faa51c89bffd2016af9b9d8f0d53f53a5e8668bd 100644 (file)
--- a/src/lib/util/pair_legacy.h
+++ b/src/lib/util/pair_legacy.h
@@ -34,7 +34,6 @@ RCSIDH(pair_legacy_h, "$Id$")
 extern "C" {
 #endif
 
-extern bool    fr_pair_legacy_nested; /* parsing: for migration from legacy flat to new nested */
 extern bool    fr_pair_legacy_print_nested; /* printing: for migration from legacy flat to new nested */
 
 fr_token_t     fr_pair_list_afrom_str(TALLOC_CTX *ctx, fr_dict_attr_t const *parent,

diff --git a/src/tests/keywords/all.mk b/src/tests/keywords/all.mk
index e98c12985c46da395fc7eefa551c75533cb5ab43..aeadc394b98b9f93a31df19f2360cbb2bee59e7c 100644 (file)
--- a/src/tests/keywords/all.mk
+++ b/src/tests/keywords/all.mk
@@ -81,7 +81,7 @@ else ifneq "$(findstring ${1}, $(KEYWORD_UPDATE_REWRITE_TESTS))" ""
 $(OUTPUT)/${1}: NEW_COND=-S rewrite_update=yes -S tmpl_tokenize_all_nested=yes
 
 else
-$(OUTPUT)/${1}: NEW_COND=-S forbid_update=yes -S tmpl_tokenize_all_nested=yes -S pair_legacy_nested=true
+$(OUTPUT)/${1}: NEW_COND=-S forbid_update=yes -S tmpl_tokenize_all_nested=yes
 
 ifeq "${1}" "mschap"
 $(OUTPUT)/${1}: $(BUILD_DIR)/lib/local/rlm_mschap.la $(BUILD_DIR)/lib/rlm_mschap.la

diff --git a/src/tests/modules/unit_test_module.conf b/src/tests/modules/unit_test_module.conf
index d266fa9e42a3971a278a16ef7b894ad3da6a3a43..594a7d98560a98ac4d198066d9371d98009e238c 100644 (file)
--- a/src/tests/modules/unit_test_module.conf
+++ b/src/tests/modules/unit_test_module.conf
@@ -17,7 +17,6 @@ security {
 #
 #migrate {
 #      tmpl_tokenize_all_nested = true
-#      pair_legacy_nested = true
 #      forbid_update = true
 #}