From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 9 Feb 2023 18:41:06 +0000 (-0600)
Subject: Remove list_as_attr from tmpl_rules_t
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=615cb01d818f6e22f2ff27c68d7fc344120e34ca;p=thirdparty%2Ffreeradius-server.git

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 ae50e5ff86e..352cd56974c 100644
--- 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 f4a9f0597ca..a700daef380 100644
--- 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 52a9ba94dc4..bfc43786280 100644
--- 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 035415cb827..c3fbb9d6a7b 100644
--- 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 6589ea66286..42394d6ae1a 100644
--- 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 bcffca921ea..aee7c8800c9 100644
--- 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;