diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2019-04-19 14:26:47 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2019-05-22 22:55:11 +0100 |
| commit | a9499ff136d89987af885e2d7dff0a066a3e5817 (patch) | |
| tree | 904b62365fed0947213dfe9d18de1bffa9404739 /src | |
| parent | a14d72ca2fec5d4eb5a043936e4f7ce08015c177 (diff) | |
| download | gnurl-a9499ff136d89987af885e2d7dff0a066a3e5817.tar.gz gnurl-a9499ff136d89987af885e2d7dff0a066a3e5817.tar.bz2 gnurl-a9499ff136d89987af885e2d7dff0a066a3e5817.zip | |
curl: --sasl-authzid added to support CURLOPT_SASL_AUTHZID from the tool
Diffstat (limited to 'src')
| -rw-r--r-- | src/tool_cfgable.c | 1 | ||||
| -rw-r--r-- | src/tool_cfgable.h | 1 | ||||
| -rw-r--r-- | src/tool_getparam.c | 6 | ||||
| -rw-r--r-- | src/tool_help.c | 2 | ||||
| -rw-r--r-- | src/tool_operate.c | 5 |
5 files changed, 14 insertions, 1 deletions
diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c index 7d178e47c..1d684f8cc 100644 --- a/src/tool_cfgable.c +++ b/src/tool_cfgable.c @@ -133,6 +133,7 @@ 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 e374a7f0e..48b7b5588 100644 --- a/src/tool_cfgable.h +++ b/src/tool_cfgable.h @@ -97,6 +97,7 @@ 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 b347121f8..f5e80b54d 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -177,7 +177,8 @@ static const struct LongShort aliases[]= { {"$H", "mail-auth", ARG_STRING}, {"$I", "post303", ARG_BOOL}, {"$J", "metalink", ARG_BOOL}, - {"$K", "sasl-ir", ARG_BOOL}, + {"$6", "sasl-authzid", ARG_STRING}, + {"$K", "sasl-ir", ARG_BOOL }, {"$L", "test-event", ARG_BOOL}, {"$M", "unix-socket", ARG_FILENAME}, {"$N", "path-as-is", ARG_BOOL}, @@ -1099,6 +1100,9 @@ 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 ad6b6a107..816f8e437 100644 --- a/src/tool_help.c +++ b/src/tool_help.c @@ -385,6 +385,8 @@ static const struct helptxt helptext[] = { "Wait time between retries"}, {" --retry-max-time <seconds>", "Retry only within this period"}, + {" --sasl-authzid <identity> ", + "Use this identity to act as during SASL PLAIN authentication"}, {" --sasl-ir", "Enable initial response in SASL authentication"}, {" --service-name <name>", diff --git a/src/tool_operate.c b/src/tool_operate.c index 462119a1c..db6f81fab 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -1501,6 +1501,10 @@ 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); @@ -1524,6 +1528,7 @@ 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); |