From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 8 Nov 2023 15:17:56 +0000 (+0100)
Subject: use radius_pairmove(), which does the same thing and more
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b95bd750c082f08d8073220127ac92d3b0f690df;p=thirdparty%2Ffreeradius-server.git

use radius_pairmove(), which does the same thing and more

in an attempt to get rid of old / duplicate APIs
---

diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c
index 7c4e94005be..50b45669a51 100644
--- a/src/modules/rlm_exec/rlm_exec.c
+++ b/src/modules/rlm_exec/rlm_exec.c
@@ -35,7 +35,7 @@ RCSID("$Id$")
 #include <freeradius-devel/server/main_config.h>
 #include <freeradius-devel/unlang/interpret.h>
 #include <freeradius-devel/util/debug.h>
-#include <freeradius-devel/util/pair_legacy.h>
+#include <freeradius-devel/server/pairmove.h>
 #include <freeradius-devel/unlang/xlat_func.h>
 #include <freeradius-devel/unlang/xlat.h>
 #include <freeradius-devel/unlang/module.h>
@@ -289,7 +289,7 @@ static unlang_action_t mod_exec_oneshot_wait_resume(rlm_rcode_t *p_result, modul
 			ctx = tmpl_list_ctx(request, tmpl_list(inst->output_list));
 
 			fr_pair_list_afrom_box(ctx, &vps, request->dict, box);
-			if (!fr_pair_list_empty(&vps)) fr_pair_list_move_op(output_pairs, &vps, T_OP_ADD_EQ);
+			if (!fr_pair_list_empty(&vps)) radius_pairmove(request, output_pairs, &vps);
 
 			fr_value_box_list_talloc_free(&m->box);	/* has been consumed */
 		}
diff --git a/src/modules/rlm_files/rlm_files.c b/src/modules/rlm_files/rlm_files.c
index 72ead5da6a9..a6cb2391518 100644
--- a/src/modules/rlm_files/rlm_files.c
+++ b/src/modules/rlm_files/rlm_files.c
@@ -564,7 +564,7 @@ redo:
 		/*
 		 *	Move the control items over, too.
 		 */
-		fr_pair_list_move_op(&request->control_pairs, &list, T_OP_ADD_EQ);
+		radius_pairmove(request, &request->control_pairs, &list);
 
 		/* ctx may be reply */
 		if (!map_list_empty(&pl->reply)) {