From db8ec1fa38a899d3542dd89ac8be0a6f00c805ac Mon Sep 17 00:00:00 2001 From: Jay Satiro Date: Fri, 24 May 2019 14:53:03 -0400 Subject: 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. --- src/tool_cfgable.c | 1 - src/tool_cfgable.h | 1 - src/tool_getparam.c | 6 +----- src/tool_help.c | 2 -- src/tool_operate.c | 5 ----- 5 files changed, 1 insertion(+), 14 deletions(-) (limited to 'src') diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c index 1d684f8cc..7d178e47c 100644 --- a/src/tool_cfgable.c +++ b/src/tool_cfgable.c @@ -133,7 +133,6 @@ static void free_config_fields(struct OperationConfig *config) Curl_safefree(config->krblevel); Curl_safefree(config->oauth_bearer); - Curl_safefree(config->sasl_authzid); Curl_safefree(config->unix_socket_path); Curl_safefree(config->writeout); diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h index 48b7b5588..e374a7f0e 100644 --- a/src/tool_cfgable.h +++ b/src/tool_cfgable.h @@ -97,7 +97,6 @@ struct OperationConfig { char *mail_from; struct curl_slist *mail_rcpt; char *mail_auth; - char *sasl_authzid; /* Authorisation identity (identity to use) */ bool sasl_ir; /* Enable/disable SASL initial response */ bool proxytunnel; bool ftp_append; /* APPE on ftp */ diff --git a/src/tool_getparam.c b/src/tool_getparam.c index f5e80b54d..b347121f8 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -177,8 +177,7 @@ static const struct LongShort aliases[]= { {"$H", "mail-auth", ARG_STRING}, {"$I", "post303", ARG_BOOL}, {"$J", "metalink", ARG_BOOL}, - {"$6", "sasl-authzid", ARG_STRING}, - {"$K", "sasl-ir", ARG_BOOL }, + {"$K", "sasl-ir", ARG_BOOL}, {"$L", "test-event", ARG_BOOL}, {"$M", "unix-socket", ARG_FILENAME}, {"$N", "path-as-is", ARG_BOOL}, @@ -1100,9 +1099,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ #endif break; } - case '6': /* --sasl-authzid */ - GetStr(&config->sasl_authzid, nextarg); - break; case 'K': /* --sasl-ir */ config->sasl_ir = toggle; break; diff --git a/src/tool_help.c b/src/tool_help.c index 816f8e437..ad6b6a107 100644 --- a/src/tool_help.c +++ b/src/tool_help.c @@ -385,8 +385,6 @@ static const struct helptxt helptext[] = { "Wait time between retries"}, {" --retry-max-time ", "Retry only within this period"}, - {" --sasl-authzid ", - "Use this identity to act as during SASL PLAIN authentication"}, {" --sasl-ir", "Enable initial response in SASL authentication"}, {" --service-name ", diff --git a/src/tool_operate.c b/src/tool_operate.c index db6f81fab..462119a1c 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -1501,10 +1501,6 @@ static CURLcode operate_do(struct GlobalConfig *global, if(config->mail_auth) my_setopt_str(curl, CURLOPT_MAIL_AUTH, config->mail_auth); - /* new in 7.66.0 */ - if(config->sasl_authzid) - my_setopt_str(curl, CURLOPT_SASL_AUTHZID, config->sasl_authzid); - /* new in 7.31.0 */ if(config->sasl_ir) my_setopt(curl, CURLOPT_SASL_IR, 1L); @@ -1528,7 +1524,6 @@ static CURLcode operate_do(struct GlobalConfig *global, config->unix_socket_path); } } - /* new in 7.45.0 */ if(config->proto_default) my_setopt_str(curl, CURLOPT_DEFAULT_PROTOCOL, config->proto_default); -- cgit v1.2.3