From 55645ecff4ef5ceabf8196258ae46e09a343f3e1 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 14 Nov 2019 14:26:17 +0100
Subject: [PATCH] connectivity: fix using curl_multi_strerror() for CURLMcode
 error code

(cherry picked from commit c24f122e222f60246037a3a75c544612c34f0bac)
(cherry picked from commit 6f39520ee9d2461b7cc2ab82ec87b9bf7ee26b95)
---
 src/nm-connectivity.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
index aee6c577bd..9d6b89b411 100644
--- a/src/nm-connectivity.c
+++ b/src/nm-connectivity.c
@@ -328,7 +328,6 @@ _con_curl_check_connectivity (CURLM *mhandle, int sockfd, int ev_bitmask)
 {
 	NMConnectivityCheckHandle *cb_data;
 	CURLMsg *msg;
-	CURLcode eret;
 	int m_left;
 	long response_code;
 	CURLMcode ret;
@@ -337,12 +336,13 @@ _con_curl_check_connectivity (CURLM *mhandle, int sockfd, int ev_bitmask)
 
 	ret = curl_multi_socket_action (mhandle, sockfd, ev_bitmask, &running_handles);
 	if (ret != CURLM_OK) {
-		_LOGD ("connectivity check failed: (%d) %s", ret, curl_easy_strerror (ret));
+		_LOGD ("connectivity check failed: (%d) %s", ret, curl_multi_strerror (ret));
 		success = FALSE;
 	}
 
 	while ((msg = curl_multi_info_read (mhandle, &m_left))) {
 		const char *response;
+		CURLcode eret;
 
 		if (msg->msg != CURLMSG_DONE)
 			continue;