Skip to content

Commit

Permalink
Revert all SASL authzid (new feature) commits
Browse files Browse the repository at this point in the history
- 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 0edf690.

Revert "tests: Fix the line endings for the SASL alt-auth tests"

This reverts commit c2a8d52.

Revert "examples: Added SASL PLAIN authorisation identity (authzid) examples"

This reverts commit 8c1cc36.

Revert "curl: --sasl-authzid added to support CURLOPT_SASL_AUTHZID from the tool"

This reverts commit a9499ff.

Revert "sasl: Implement SASL authorisation identity via CURLOPT_SASL_AUTHZID"

This reverts commit a14d72c.
  • Loading branch information
jay authored and bagder committed May 25, 2019
1 parent 84086b3 commit db8ec1f
Show file tree
Hide file tree
Showing 31 changed files with 17 additions and 763 deletions.
1 change: 0 additions & 1 deletion docs/cmdline-opts/Makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ DPAGES = \
retry-delay.d \
retry-max-time.d \
retry.d \
sasl-authzid.d \
sasl-ir.d \
service-name.d \
show-error.d \
Expand Down
11 changes: 0 additions & 11 deletions docs/cmdline-opts/sasl-authzid.d

This file was deleted.

4 changes: 2 additions & 2 deletions docs/examples/Makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
Expand Down Expand Up @@ -35,7 +35,7 @@ check_PROGRAMS = 10-at-a-time anyauthput cookie_interface debug fileupload \
http2-upload http2-serverpush getredirect ftpuploadfrommem \
ftpuploadresume sslbackend postit2-formadd multi-formadd \
shared-connection-cache sftpuploadresume http2-pushinmemory parseurl \
urlapi imap-authzid pop3-authzid smtp-authzid
urlapi

# These examples require external dependencies that may not be commonly
# available on POSIX systems, so don't bother attempting to compile them here.
Expand Down
71 changes: 0 additions & 71 deletions docs/examples/imap-authzid.c

This file was deleted.

70 changes: 0 additions & 70 deletions docs/examples/pop3-authzid.c

This file was deleted.

161 changes: 0 additions & 161 deletions docs/examples/smtp-authzid.c

This file was deleted.

2 changes: 0 additions & 2 deletions docs/libcurl/curl_easy_setopt.3
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,6 @@ TLS authentication methods. See \fICURLOPT_TLSAUTH_TYPE(3)\fP
Proxy TLS authentication methods. See \fICURLOPT_PROXY_TLSAUTH_TYPE(3)\fP
.IP CURLOPT_PROXYAUTH
HTTP proxy authentication methods. See \fICURLOPT_PROXYAUTH(3)\fP
.IP CURLOPT_SASL_AUTHZID
SASL authorisation identity (identity to act as). See \fICURLOPT_SASL_AUTHZID(3)\fP
.IP CURLOPT_SASL_IR
Enable SASL initial response. See \fICURLOPT_SASL_IR(3)\fP
.IP CURLOPT_XOAUTH2_BEARER
Expand Down
Loading

0 comments on commit db8ec1f

Please sign in to comment.