From: Nick Porter <nick@portercomputing.co.uk>
Date: Fri, 7 Jul 2023 07:05:08 +0000 (+0100)
Subject: Allow for nested or flat attributes in fr_pair_list_copy_by_ancestor
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e83fdf992e5e0c8a70e8ae32701fe950ef70298;p=thirdparty%2Ffreeradius-server.git

Allow for nested or flat attributes in fr_pair_list_copy_by_ancestor

Will be removed once everything is nested, and it just becomes a list
copy from the ancestor.
---

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index 28eaacc4ba5..0e131021c50 100644
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -2209,15 +2209,30 @@ int fr_pair_list_copy_by_da(TALLOC_CTX *ctx, fr_pair_list_t *to,
 int fr_pair_list_copy_by_ancestor(TALLOC_CTX *ctx, fr_pair_list_t *to,
 				  fr_pair_list_t const *from, fr_dict_attr_t const *parent_da, unsigned int count)
 {
-	fr_pair_t	*vp, *new_vp;
+	fr_pair_t	*vp, *new_vp, *tlv;
 	unsigned int	cnt = 0;
 
 	if (count == 0) count = UINT_MAX;
 
+	/*
+	 *	Allow for nested attributes.
+	 */
+	tlv = fr_pair_find_by_da(from, NULL, parent_da);
+	if (tlv) {
+		switch (parent_da->type) {
+		case FR_TYPE_STRUCTURAL:
+			from = &tlv->vp_group;
+			break;
+
+		default:
+			fr_assert(0);
+		}
+	}
+
 	for (vp = fr_pair_list_head(from);
 	     vp && (cnt < count);
 	     vp = fr_pair_list_next(from, vp)) {
-		if (!fr_dict_attr_common_parent(parent_da, vp->da, true)) continue;
+		if (!tlv && !fr_dict_attr_common_parent(parent_da, vp->da, true)) continue;
 		cnt++;
 
 		PAIR_VERIFY_WITH_LIST(from, vp);