From: Nick Porter <nick@portercomputing.co.uk>
Date: Tue, 17 Sep 2024 15:36:12 +0000 (+0100)
Subject: Handle deprecation of CURLINFO_LASTSOCKET
X-Git-Tag: release_3_2_7~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf0f38ce8905788dfcb10b2266413e6201729617;p=thirdparty%2Ffreeradius-server.git

Handle deprecation of CURLINFO_LASTSOCKET
---

diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c
index 035f5578fe7..e7fb019c5dc 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;
 	}