PR#3878: UTIL: Fix compilation with curl 7.62.0 - SSSD/sssd

SSSD / sssd

#3878 UTIL: Fix compilation with curl 7.62.0

Merged 5 years ago by jhrozek. Opened 5 years ago by lslebodn.

SSSD/ lslebodn/sssd curl_7_62_0 into master

UTIL: Fix compilation with curl 7.62.0

Lukas Slebodnik • 5 years ago

66344b8

src/util/tev_curl.c

file modified

		`@@ -97,7 +97,9 @@`
		`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;`

lslebodn commented 5 years ago

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:
^~

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

rebased onto 66344b8

5 years ago

sbose commented 5 years ago

Thank you for the patch, the patch looks good and I agree that just using #if directly in the code the most straight forward solution. I'll do a CI run before giving the final ACK.

sbose commented 5 years ago

CI run was fine. ACK.