From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 13 Nov 2020 18:10:37 +0000 (-0600)
Subject: fr_pair_list_copy should append not prepend
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d0e6191b63e5b3de9c2afbc72fce736f4d2cfec;p=thirdparty%2Ffreeradius-server.git

fr_pair_list_copy should append not prepend
---

diff --git a/src/lib/server/map.c b/src/lib/server/map.c
index 27eea137ba6..520cdd9dab7 100644
--- a/src/lib/server/map.c
+++ b/src/lib/server/map.c
@@ -1583,7 +1583,6 @@ int map_to_request(request_t *request, map_t const *map, radius_map_getvalue_t f
 		tmpl_attr_extent_t 	*extent = NULL;
 		fr_dlist_head_t		leaf;
 		fr_dlist_head_t		interior;
-		fr_pair_t 		*src_vp;
 
 		fr_dlist_talloc_init(&leaf, tmpl_attr_extent_t, entry);
 		fr_dlist_talloc_init(&interior, tmpl_attr_extent_t, entry);
@@ -1601,7 +1600,6 @@ int map_to_request(request_t *request, map_t const *map, radius_map_getvalue_t f
 
 		if (fr_dlist_num_elements(&leaf) > 1) {
 			while ((extent = fr_dlist_remove(&leaf, NULL))) {
-				fr_pair_add(extent->list, fr_pair_copy(extent->list_ctx, src_vp));
 				fr_pair_list_copy(extent->list_ctx, extent->list, &head);
 				fr_dlist_talloc_free_head(&leaf);
 			}
diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index 3e343f7db8e..657c08826a7 100644
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -1269,6 +1269,7 @@ int fr_pair_list_copy(TALLOC_CTX *ctx, fr_pair_list_t *to, fr_pair_list_t const
 	} else {
 		fr_cursor_talloc_init(&dst, to, fr_pair_t);
 		fr_cursor_head(&tmp);
+		fr_cursor_tail(&dst);
 		fr_cursor_merge(&dst, &tmp);
 	}