From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 23 Jan 2025 11:33:38 +0000 (+0000)
Subject: Back port CURL version fixes from 3.2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=097a74e76bbd5a99f4629a29f271d2c525fb9b9c;p=thirdparty%2Ffreeradius-server.git

Back port CURL version fixes from 3.2
---

diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c
index dc6346943b..649a76b663 100644
--- a/src/modules/rlm_rest/rest.c
+++ b/src/modules/rlm_rest/rest.c
@@ -480,10 +480,15 @@ int mod_conn_alive(void *instance, void *handle)
 	rlm_rest_handle_t	*randle = handle;
 	CURL			*candle = randle->handle;
 
-	long last_socket;
 	CURLcode ret;
 
-	ret = curl_easy_getinfo(candle, CURLINFO_LASTSOCKET, &last_socket);
+#if CURL_AT_LEAST_VERSION(7,45,0)
+	curl_socket_t	socket;
+	ret = curl_easy_getinfo(candle, CURLINFO_ACTIVESOCKET, &socket);
+#else
+	long	socket;
+	ret = curl_easy_getinfo(candle, CURLINFO_LASTSOCKET, &socket);
+#endif
 	if (ret != CURLE_OK) {
 		ERROR("rlm_rest (%s): Couldn't determine socket state: %i - %s", inst->xlat_name, ret,
 		      curl_easy_strerror(ret));
@@ -491,7 +496,7 @@ int mod_conn_alive(void *instance, void *handle)
 		return false;
 	}
 
-	if (last_socket == -1) {
+	if (socket == -1) {
 		return false;
 	}
 
@@ -2237,9 +2242,11 @@ int rest_request_config(rlm_rest_t *instance, rlm_rest_section_t *section,
 		SET_OPTION(CURLOPT_CAPATH, section->tls_ca_path);
 	}
 
+#if !CURL_AT_LEAST_VERSION(7,84,0)
 	if (section->tls_random_file) {
 		SET_OPTION(CURLOPT_RANDOM_FILE, section->tls_random_file);
 	}
+#endif
 
 	SET_OPTION(CURLOPT_SSL_VERIFYPEER, (section->tls_check_cert == true) ? 1 : 0);
 	SET_OPTION(CURLOPT_SSL_VERIFYHOST, (section->tls_check_cert_cn == true) ? 2 : 0);