moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

sasl-ir: Added --sasl-ir option to curl command line tool

This commit is contained in:
Steve Holme 2013-04-27 09:54:14 +01:00
parent a846fbbe2a
commit 5d3a031ca7
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tool_cfgable.h
View File

@ -80,6 +80,7 @@ struct Configurable {
char *mail_from; char *mail_from;
struct curl_slist *mail_rcpt; struct curl_slist *mail_rcpt;
char *mail_auth; char *mail_auth;
bool sasl_ir; /* Enable/disable SASL initial response */
bool proxytunnel; bool proxytunnel;
bool ftp_append; /* APPE on ftp */ bool ftp_append; /* APPE on ftp */
bool mute; /* don't show messages, --silent given */ bool mute; /* don't show messages, --silent given */

4
src/tool_getparam.c
View File

@ -173,6 +173,7 @@ static const struct LongShort aliases[]= {
{"$H", "mail-auth", TRUE}, {"$H", "mail-auth", TRUE},
{"$I", "post303", FALSE}, {"$I", "post303", FALSE},
{"$J", "metalink", FALSE}, {"$J", "metalink", FALSE},
{"$K", "sasl-ir", FALSE},
{"0", "http1.0", FALSE}, {"0", "http1.0", FALSE},
{"1", "tlsv1", FALSE}, {"1", "tlsv1", FALSE},
{"2", "sslv2", FALSE}, {"2", "sslv2", FALSE},
@ -858,6 +859,9 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
#endif #endif
break; break;
} }
case 'K': /* --sasl-ir */
config->sasl_ir = TRUE;
break;
} }
break; break;
case '#': /* --progress-bar */ case '#': /* --progress-bar */

1
src/tool_help.c
View File

@ -173,6 +173,7 @@ static const char *const helptext[] = {
" --retry-delay SECONDS " " --retry-delay SECONDS "
"When retrying, wait this many seconds between each", "When retrying, wait this many seconds between each",
" --retry-max-time SECONDS Retry only within this period", " --retry-max-time SECONDS Retry only within this period",
" --sasl-ir Enable initial response in SASL authentication"
" -S, --show-error " " -S, --show-error "
"Show error. With -s, make curl show errors when they occur", "Show error. With -s, make curl show errors when they occur",
" -s, --silent Silent mode. Don't output anything", " -s, --silent Silent mode. Don't output anything",

4
src/tool_operate.c
View File

@ -1320,6 +1320,10 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
if(config->mail_auth) if(config->mail_auth)
my_setopt_str(curl, CURLOPT_MAIL_AUTH, config->mail_auth); my_setopt_str(curl, CURLOPT_MAIL_AUTH, config->mail_auth);
/* new in 7.30.1 */
if(config->sasl_ir)
my_setopt(curl, CURLOPT_SASL_IR, (long)TRUE);
/* initialize retry vars for loop below */ /* initialize retry vars for loop below */
retry_sleep_default = (config->retry_delay) ? retry_sleep_default = (config->retry_delay) ?
config->retry_delay*1000L : RETRY_SLEEP_DEFAULT; /* ms */ config->retry_delay*1000L : RETRY_SLEEP_DEFAULT; /* ms */