File 0037-UTIL-Fix-compilation-with-curl-7.62.0.patch of Package sssd.24394

Overview Repositories Revisions Requests Users Attributes Meta

File 0037-UTIL-Fix-compilation-with-curl-7.62.0.patch of Package sssd.24394

From da2794f10e35f61278e95f86dcb068d152dd86ab Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Wed, 7 Nov 2018 23:06:10 +0000
Subject: [PATCH] UTIL: Fix compilation with curl 7.62.0

The macro CURLE_SSL_CACERT is deprecated in upstream curl
since commit 3f3b26d6feb0667714902e836af608094235fca2.

commit 3f3b26d6feb0667714902e836af608094235fca2
  Author: Han Han <hhan@thousandeyes.com>
  Date:   Wed Aug 22 11:13:32 2018 -0700

ssl: deprecate CURLE_SSL_CACERT in favour of a unified error code

Long live CURLE_PEER_FAILED_VERIFICATION

sh$ git tag --contains 3f3b26d6feb0667714902e836af608094235fca2
  curl-7_62_0

It was not removed. It is just an alias to
CURLE_PEER_FAILED_VERIFICATION which causes compile time failures in
switch/case.

./src/util/tev_curl.c: In function 'curl_code2errno':
./src/util/tev_curl.c:113:5: error: duplicate case value
     case CURLE_PEER_FAILED_VERIFICATION:
     ^~~~
./src/util/tev_curl.c: 100:5: note: previously used here
     case CURLE_SSL_CACERT:
     ^~~~

Merges: https://pagure.io/SSSD/sssd/pull-request/3878

Resolves:
https://pagure.io/SSSD/sssd/issue/3875

Reviewed-by: Sumit Bose <sbose@redhat.com>
(cherry picked from commit 1ee12b05570fcfb8e4190c9ec704c5563138344d)
(cherry picked from commit 4d3841ca379afc01184453ba45ab3e75ffec60da)
---
 src/util/tev_curl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/util/tev_curl.c b/src/util/tev_curl.c
index 4c2f1ec9f..c9ebff650 100644
--- a/src/util/tev_curl.c
+++ b/src/util/tev_curl.c
@@ -96,7 +96,9 @@ static errno_t curl_code2errno(CURLcode crv)
         return ETIMEDOUT;
     case CURLE_SSL_ISSUER_ERROR:
     case CURLE_SSL_CACERT_BADFILE:
+#if LIBCURL_VERSION_NUM < 0x073e00
     case CURLE_SSL_CACERT:
+#endif
     case CURLE_SSL_CERTPROBLEM:
         return ERR_INVALID_CERT;
 
-- 
2.28.0

Places

File 0037-UTIL-Fix-compilation-with-curl-7.62.0.patch of Package sssd.24394

Places