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 /include | |
parent | 84086b39c14c930947b0de2abe5d8eff712f29e4 (diff) | |
download | curl-db8ec1fa38a899d3542dd89ac8be0a6f00c805ac.tar.gz |
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 'include')
-rw-r--r-- | include/curl/curl.h | 3 | ||||
-rw-r--r-- | include/curl/typecheck-gcc.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h index 0c86e945a..d83b21798 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -1921,9 +1921,6 @@ typedef enum { /* maximum age of a connection to consider it for reuse (in seconds) */ CINIT(MAXAGE_CONN, LONG, 288), - /* SASL authorisation identity */ - CINIT(SASL_AUTHZID, STRINGPOINT, 289), - CURLOPT_LASTENTRY /* the last unused */ } CURLoption; diff --git a/include/curl/typecheck-gcc.h b/include/curl/typecheck-gcc.h index 8827058e9..2d1de4d43 100644 --- a/include/curl/typecheck-gcc.h +++ b/include/curl/typecheck-gcc.h @@ -309,7 +309,6 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_off_t, (option) == CURLOPT_RTSP_SESSION_ID || \ (option) == CURLOPT_RTSP_STREAM_URI || \ (option) == CURLOPT_RTSP_TRANSPORT || \ - (option) == CURLOPT_SASL_AUTHZID || \ (option) == CURLOPT_SERVICE_NAME || \ (option) == CURLOPT_SOCKS5_GSSAPI_SERVICE || \ (option) == CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 || \ |