aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Monnerat <patrick@monnerat.net>2019-05-23 13:24:53 +0200
committerJay Satiro <raysatiro@yahoo.com>2019-08-06 11:39:05 -0400
commit825c571d26b8f95c3781a18793abfd2b29fececb (patch)
tree5aceff67a7af1b201befd6c4d304aa15d5335df8
parenta44394eac54ef851f70f7b50814e05d363410be7 (diff)
os400: take care of CURLOPT_SASL_AUTHZID in curl_easy_setopt_ccsid().
Ref: https://github.com/curl/curl/issues/3653 Ref: https://github.com/curl/curl/pull/3790 NOTE: This commit was cherry-picked and is part of a series of commits that added the authzid feature for upcoming 7.66.0. The series was temporarily reverted in db8ec1f so that it would not ship in a 7.65.x patch release. Closes https://github.com/curl/curl/pull/4186
-rw-r--r--packages/OS400/README.OS4001
-rw-r--r--packages/OS400/ccsidcurl.c7
2 files changed, 2 insertions, 6 deletions
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400
index c653ceceb..95a558411 100644
--- a/packages/OS400/README.OS400
+++ b/packages/OS400/README.OS400
@@ -120,6 +120,7 @@ options:
CURLOPT_RTSP_SESSION_UID
CURLOPT_RTSP_STREAM_URI
CURLOPT_RTSP_TRANSPORT
+ CURLOPT_SASL_AUTHZID
CURLOPT_SERVICE_NAME
CURLOPT_SOCKS5_GSSAPI_SERVICE
CURLOPT_SSH_HOST_PUBLIC_KEY_MD5
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index a55cd5e10..11e4c777e 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -1141,12 +1141,7 @@ curl_easy_setopt_ccsid(CURL *curl, CURLoption tag, ...)
if(testwarn) {
testwarn = 0;
- if(
-#ifdef USE_ALTSVC
- (int) STRING_LASTZEROTERMINATED != (int) STRING_ALTSVC + 1 ||
-#else
- (int) STRING_LASTZEROTERMINATED != (int) STRING_DOH + 1 ||
-#endif
+ if((int) STRING_LASTZEROTERMINATED != (int) STRING_SASL_AUTHZID + 1 ||
(int) STRING_LAST != (int) STRING_COPYPOSTFIELDS + 1)
curl_mfprintf(stderr,
"*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n");