diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2019-05-24 14:53:03 -0400 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-05-25 23:36:11 +0200 |
| commit | db8ec1fa38a899d3542dd89ac8be0a6f00c805ac (patch) | |
| tree | b6c969212d2ae449071d56759268d5d450b5acd2 /packages | |
| parent | 84086b39c14c930947b0de2abe5d8eff712f29e4 (diff) | |
Revert all SASL authzid (new feature) commits
- Revert all commits related to the SASL authzid feature since the next
release will be a patch release, 7.65.1.
Prior to this change CURLOPT_SASL_AUTHZID / --sasl-authzid was destined
for the next release, assuming it would be a feature release 7.66.0.
However instead the next release will be a patch release, 7.65.1 and
will not contain any new features.
After the patch release after the reverted commits can be restored by
using cherry-pick:
git cherry-pick a14d72c a9499ff 8c1cc36 c2a8d52 0edf690
Details for all reverted commits:
Revert "os400: take care of CURLOPT_SASL_AUTHZID in curl_easy_setopt_ccsid()."
This reverts commit 0edf6907ae37e2020722e6f61229d8ec64095b0a.
Revert "tests: Fix the line endings for the SASL alt-auth tests"
This reverts commit c2a8d52a1356a722ff9f4aeb983cd4eaf80ef221.
Revert "examples: Added SASL PLAIN authorisation identity (authzid) examples"
This reverts commit 8c1cc369d0c7163c6dcc91fd38edfea1f509ae75.
Revert "curl: --sasl-authzid added to support CURLOPT_SASL_AUTHZID from the tool"
This reverts commit a9499ff136d89987af885e2d7dff0a066a3e5817.
Revert "sasl: Implement SASL authorisation identity via CURLOPT_SASL_AUTHZID"
This reverts commit a14d72ca2fec5d4eb5a043936e4f7ce08015c177.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/OS400/README.OS400 | 1 | ||||
| -rw-r--r-- | packages/OS400/ccsidcurl.c | 8 | ||||
| -rw-r--r-- | packages/OS400/curl.inc.in | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index 95a558411..c653ceceb 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -120,7 +120,6 @@ 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 85fb4693d..fd3b5f073 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -1139,7 +1139,12 @@ curl_easy_setopt_ccsid(CURL *curl, CURLoption tag, ...) if(testwarn) { testwarn = 0; - if((int) STRING_LASTZEROTERMINATED != (int) STRING_SASL_AUTHZID + 1 || + if( +#ifdef USE_ALTSVC + (int) STRING_LASTZEROTERMINATED != (int) STRING_ALTSVC + 1 || +#else + (int) STRING_LASTZEROTERMINATED != (int) STRING_DOH + 1 || +#endif (int) STRING_LAST != (int) STRING_COPYPOSTFIELDS + 1) curl_mfprintf(stderr, "*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n"); @@ -1206,7 +1211,6 @@ curl_easy_setopt_ccsid(CURL *curl, CURLoption tag, ...) case CURLOPT_RTSP_SESSION_ID: case CURLOPT_RTSP_STREAM_URI: case CURLOPT_RTSP_TRANSPORT: - case CURLOPT_SASL_AUTHZID: case CURLOPT_SERVICE_NAME: case CURLOPT_SOCKS5_GSSAPI_SERVICE: case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5: diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index 61405bd13..8e36bac3b 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -1418,8 +1418,6 @@ d c 10287 d CURLOPT_MAXAGE_CONN... d c 00288 - d CURLOPT_SASL_AUTHZID... - d c 10289 * /if not defined(CURL_NO_OLDIES) d CURLOPT_FILE c 10001 |