From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 10 May 2018 16:06:01 +0000 (+0600)
Subject: Convert some calls from mcopy to fr_pair_list_dup
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b41bb89d93ddf6ae81ef662e89a814ce2622237;p=thirdparty%2Ffreeradius-server.git

Convert some calls from mcopy to fr_pair_list_dup
---

diff --git a/src/lib/tls/validate.c b/src/lib/tls/validate.c
index 665346724b9..96609936bba 100644
--- a/src/lib/tls/validate.c
+++ b/src/lib/tls/validate.c
@@ -155,7 +155,7 @@ int tls_validate_cert_cb(int ok, X509_STORE_CTX *x509_ctx)
 			 *	cert_vps have a different talloc parent, so we
 			 *	can't just reference them.
 			 */
-			fr_pair_list_mcopy_by_num(request->state_ctx, &request->state, &cert_vps, 0, 0, TAG_ANY);
+			MEM(fr_pair_list_dup(request->state_ctx, &request->state, cert_vps) == 0);
 			fr_pair_list_free(&cert_vps);
 		}
 	}
diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
index d9a27eb7602..08a3b9e284c 100644
--- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
+++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
@@ -472,7 +472,7 @@ failure:
 		case FR_EAP_MSCHAPV2_SUCCESS:
 			eap_round->request->code = FR_EAP_CODE_SUCCESS;
 
-			fr_pair_list_mcopy_by_num(request->reply, &request->reply->vps, &data->mppe_keys, 0, 0, TAG_ANY);
+			MEM(fr_pair_list_dup(request->reply, &request->reply->vps, data->mppe_keys) == 0);
 			/* FALL-THROUGH */
 
 		case FR_EAP_MSCHAPV2_ACK:
@@ -482,7 +482,7 @@ failure:
 			 */
 			request->options &= ~RAD_REQUEST_OPTION_PROXY_EAP;
 #endif
-			fr_pair_list_mcopy_by_num(request->reply, &request->reply->vps, &data->reply, 0, 0, TAG_ANY);
+			MEM(fr_pair_list_dup(request->reply, &request->reply->vps, data->reply) == 0);
 			return RLM_MODULE_OK;
 		}
 		REDEBUG("Sent SUCCESS expecting SUCCESS (or ACK) but got %d", ccode);
diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
index 4d1261aa2e7..eb6014c152b 100644
--- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c
@@ -726,7 +726,7 @@ rlm_rcode_t eap_peap_process(eap_session_t *eap_session, tls_session_t *tls_sess
 
 		/* save the SoH VPs */
 		rad_assert(!t->soh_reply_vps);
-		fr_pair_list_mcopy_by_num(t, &t->soh_reply_vps, &fake->reply->vps, 0, 0, TAG_ANY);
+		MEM(fr_pair_list_dup(t, &t->soh_reply_vps, fake->reply->vps) == 0);
 		rad_assert(!fake->reply->vps);
 		TALLOC_FREE(fake);