Remove list_as_attr from tmpl_rules_t

diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c
index ae50e5ff86e10a4cae778910b2d45257dc9ce212..352cd56974c9ea08a45cf11560f32cba5d1afadf 100644 (file)
--- a/src/bin/unit_test_attribute.c
+++ b/src/bin/unit_test_attribute.c
@@ -2871,7 +2871,6 @@ static size_t command_xlat_expr(command_result_t *result, command_file_ctx_t *cc
                                                           cc->tmpl_rules.attr.dict_def : cc->config->dict,
                                                        .allow_unresolved = cc->tmpl_rules.attr.allow_unresolved,
                                                        .list_def = PAIR_LIST_REQUEST,
-                                                       .list_as_attr = true,
                                                }
                                           });
        if (dec_len <= 0) {
@@ -2912,7 +2911,6 @@ static size_t command_xlat_purify(command_result_t *result, command_file_ctx_t *
                                                           cc->tmpl_rules.attr.dict_def : cc->config->dict,
                                                        .allow_unresolved = cc->tmpl_rules.attr.allow_unresolved,
                                                        .list_def = PAIR_LIST_REQUEST,
-                                                       .list_as_attr = true,
                                                   },
                                           });
        if (dec_len <= 0) {

diff --git a/src/lib/server/cf_parse.c b/src/lib/server/cf_parse.c
index f4a9f0597cae97d13bfc53f2a6c1059e0e9074ec..a700daef380e0f99a463fce6cb85a63d36653653 100644 (file)
--- a/src/lib/server/cf_parse.c
+++ b/src/lib/server/cf_parse.c
@@ -224,7 +224,7 @@ int cf_pair_parse_value(TALLOC_CTX *ctx, void *out, UNUSED void *base, CONF_ITEM
                                                .attr = {
                                                        .allow_unknown = true,
                                                        .allow_unresolved = true,
-                                                       .allow_foreign = true
+                                                       .allow_foreign = true,
                                                }
                                        };
                fr_sbuff_t              sbuff = FR_SBUFF_IN(cp->value, strlen(cp->value));

diff --git a/src/lib/server/map.c b/src/lib/server/map.c
index 52a9ba94dc45daacf1c63d3342b1e6b374444085..bfc4378628080f07fcf78e3dddf1e4f05f52bfe7 100644 (file)
--- a/src/lib/server/map.c
+++ b/src/lib/server/map.c
@@ -1769,7 +1769,6 @@ int map_to_request(request_t *request, map_t const *map, radius_map_getvalue_t f
                                                .attr = {
                                                        .dict_def = request->dict,
                                                        .list_def = PAIR_LIST_REQUEST,
-                                                       .list_as_attr = true,
                                                        .prefix = TMPL_ATTR_REF_PREFIX_NO
                                                }
                                           });

diff --git a/src/lib/server/tmpl.h b/src/lib/server/tmpl.h
index 035415cb827cfed5e64eb439df29afc889ced352..c3fbb9d6a7b9620be6c0a146384cdf0b70c0334b 100644 (file)
--- a/src/lib/server/tmpl.h
+++ b/src/lib/server/tmpl.h
@@ -320,8 +320,6 @@ struct tmpl_attr_rules_s {
        uint8_t                 disallow_qualifiers:1;  //!< disallow request / list qualifiers
 
        uint8_t                 disallow_filters:1;     //!< disallow filters.
-
-       uint8_t                 list_as_attr:1;         //!< return #TMPL_TYPE_ATTR for lists
 };
 
 struct tmpl_xlat_rules_s {

diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c
index 6589ea6628698855dadb07f2724b7d77e8bf2122..42394d6ae1a9ec883731cc0b69161edaa4c63c48 100644 (file)
--- a/src/lib/unlang/compile.c
+++ b/src/lib/unlang/compile.c
@@ -1759,7 +1759,6 @@ static unlang_t *compile_edit_section(unlang_t *parent, unlang_compile_t *unlang
         */
        t_rules = *(unlang_ctx->rules);
        t_rules.attr.allow_unknown = true;
-       t_rules.attr.list_as_attr = true;
        RULES_VERIFY(&t_rules);
 
        c = *prev;
@@ -1880,7 +1879,6 @@ static unlang_t *compile_edit_pair(unlang_t *parent, unlang_compile_t *unlang_ct
         */
        t_rules = *(unlang_ctx->rules);
        t_rules.attr.allow_unknown = true;
-       t_rules.attr.list_as_attr = true;
        RULES_VERIFY(&t_rules);
 
        /*

diff --git a/src/lib/unlang/xlat_expr.c b/src/lib/unlang/xlat_expr.c
index bcffca921ea9a06a50838c547dcedae2cca003f3..aee7c8800c9a7572be9a8c0287407f8c767429e5 100644 (file)
--- a/src/lib/unlang/xlat_expr.c
+++ b/src/lib/unlang/xlat_expr.c
@@ -1564,7 +1564,6 @@ static xlat_action_t xlat_exists_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
                                                   .prefix = TMPL_ATTR_REF_PREFIX_AUTO,
                                                   .allow_unknown = false,
                                                   .allow_unresolved = false,
-                                                  .list_as_attr = true,
                                           },
                                   });
        if (slen <= 0) goto fail;