From: Terry Burton <tez@terryburton.co.uk>
Date: Fri, 8 May 2020 15:40:14 +0000 (+0100)
Subject: cURL: Fix type conflation with curl_multi_add_handle()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e30ae2fffec96372862ce86f68fbcb983826182;p=thirdparty%2Ffreeradius-server.git

cURL: Fix type conflation with curl_multi_add_handle()
---

diff --git a/src/lib/curl/io.c b/src/lib/curl/io.c
index f0bd5a026ff..03abfdc9945 100644
--- a/src/lib/curl/io.c
+++ b/src/lib/curl/io.c
@@ -372,6 +372,7 @@ static int _fr_curl_io_event_modify(UNUSED CURL *easy, curl_socket_t fd, int wha
 int fr_curl_io_request_enqueue(fr_curl_handle_t *mhandle, REQUEST *request, fr_curl_io_request_t *randle)
 {
 	CURLcode		ret;
+	CURLMcode		mret;
 
 	REQUEST_VERIFY(request);
 
@@ -394,10 +395,10 @@ int fr_curl_io_request_enqueue(fr_curl_handle_t *mhandle, REQUEST *request, fr_c
 	 *      event loop modifications calls immediately.
 	 */
 	mhandle->transfers++;
-	ret = curl_multi_add_handle(mhandle->mandle, randle->candle);
-	if (ret != CURLE_OK) {
+	mret = curl_multi_add_handle(mhandle->mandle, randle->candle);
+	if (mret != CURLM_OK) {
 		mhandle->transfers--;
-		REDEBUG("Request failed: %i - %s", ret, curl_easy_strerror(ret));
+		REDEBUG("Request failed: %i - %s", mret, curl_multi_strerror(mret));
 		return -1;
 	}