From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 9 Nov 2020 10:44:20 +0000 (+0000)
Subject: Amend fr_pair_list_copy_by_ancestor to take fr_pair_list_t *
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cc52a4b5ce6df180b6e6b628a494fb7cebe4aff;p=thirdparty%2Ffreeradius-server.git

Amend fr_pair_list_copy_by_ancestor to take fr_pair_list_t *
---

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index 34c97875d32..eeae7ae5b99 100644
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -1338,7 +1338,7 @@ int fr_pair_list_copy_by_da(TALLOC_CTX *ctx, fr_pair_list_t *to,
  *	- -1 on error.
  */
 int fr_pair_list_copy_by_ancestor(TALLOC_CTX *ctx, fr_pair_list_t *to,
-				  fr_pair_t *from, fr_dict_attr_t const *parent_da)
+				  fr_pair_list_t *from, fr_dict_attr_t const *parent_da)
 {
 	fr_cursor_t	src, dst, tmp;
 
@@ -1352,7 +1352,7 @@ int fr_pair_list_copy_by_ancestor(TALLOC_CTX *ctx, fr_pair_list_t *to,
 	}
 
 	fr_cursor_talloc_init(&tmp, &head, fr_pair_t);
-	for (vp = fr_cursor_iter_by_ancestor_init(&src, &from, parent_da);
+	for (vp = fr_cursor_iter_by_ancestor_init(&src, from, parent_da);
 	     vp;
 	     vp = fr_cursor_next(&src), cnt++) {
 		VP_VERIFY(vp);
diff --git a/src/lib/util/pair.h b/src/lib/util/pair.h
index d3d1d9132bc..267502c2fc6 100644
--- a/src/lib/util/pair.h
+++ b/src/lib/util/pair.h
@@ -274,7 +274,7 @@ int		fr_pair_list_copy(TALLOC_CTX *ctx, fr_pair_list_t *to, fr_pair_list_t const
 int		fr_pair_list_copy_by_da(TALLOC_CTX *ctx, fr_pair_list_t *to,
 					fr_pair_list_t *from, fr_dict_attr_t const *da);
 int		fr_pair_list_copy_by_ancestor(TALLOC_CTX *ctx, fr_pair_list_t *to,
-					      fr_pair_t *from, fr_dict_attr_t const *parent_da);
+					      fr_pair_list_t *from, fr_dict_attr_t const *parent_da);
 
 /** @name Pair to pair copying
  *