From: Nick Porter <nick@portercomputing.co.uk>
Date: Wed, 25 Jan 2023 19:28:22 +0000 (+0000)
Subject: Allow for list_as_attr when maps are list to list
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74cdd48d7782c593728d48ae0b47a1fdb9f1fbc6;p=thirdparty%2Ffreeradius-server.git

Allow for list_as_attr when maps are list to list
---

diff --git a/src/lib/server/map.c b/src/lib/server/map.c
index 8dd853cd8a1..e354c340cf6 100644
--- a/src/lib/server/map.c
+++ b/src/lib/server/map.c
@@ -1513,7 +1513,8 @@ int map_to_vp(TALLOC_CTX *ctx, fr_pair_list_t *out, request_t *request, map_t co
 	 *	to allocate any attributes, just finding the current list, and change
 	 *	the op.
 	 */
-	if (tmpl_is_list(map->lhs) && tmpl_is_list(map->rhs)) {
+	if ((tmpl_is_list(map->lhs) || (tmpl_contains_attr(map->lhs) && tmpl_attr_tail_da_is_structural(map->lhs))) &&
+	    (tmpl_is_list(map->rhs) || (tmpl_contains_attr(map->rhs) && tmpl_attr_tail_da_is_structural(map->rhs)))) {
 		fr_pair_list_t *from = NULL;
 
 		if (tmpl_request_ptr(&context, tmpl_request(map->rhs)) == 0) {