diff options
| -rw-r--r-- | src/tool_cfgable.h | 1 | ||||
| -rw-r--r-- | src/tool_getparam.c | 4 | ||||
| -rw-r--r-- | src/tool_help.c | 1 | ||||
| -rw-r--r-- | src/tool_operate.c | 4 | 
4 files changed, 10 insertions, 0 deletions
diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h index 1f6f94852..e6611fca0 100644 --- a/src/tool_cfgable.h +++ b/src/tool_cfgable.h @@ -80,6 +80,7 @@ struct Configurable {    char *mail_from;    struct curl_slist *mail_rcpt;    char *mail_auth; +  bool sasl_ir;             /* Enable/disable SASL initial response */    bool proxytunnel;    bool ftp_append;          /* APPE on ftp */    bool mute;                /* don't show messages, --silent given */ diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 297b986f5..b44b9c020 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -173,6 +173,7 @@ static const struct LongShort aliases[]= {    {"$H", "mail-auth",                TRUE},    {"$I", "post303",                  FALSE},    {"$J", "metalink",                 FALSE}, +  {"$K", "sasl-ir",                  FALSE},    {"0",  "http1.0",                  FALSE},    {"1",  "tlsv1",                    FALSE},    {"2",  "sslv2",                    FALSE}, @@ -858,6 +859,9 @@ ParameterError getparameter(char *flag,    /* f or -long-flag */  #endif            break;          } +      case 'K': /* --sasl-ir */ +        config->sasl_ir = TRUE; +        break;        }        break;      case '#': /* --progress-bar */ diff --git a/src/tool_help.c b/src/tool_help.c index e81360269..64534acf8 100644 --- a/src/tool_help.c +++ b/src/tool_help.c @@ -173,6 +173,7 @@ static const char *const helptext[] = {    "     --retry-delay SECONDS "    "When retrying, wait this many seconds between each",    "     --retry-max-time SECONDS  Retry only within this period", +  "     --sasl-ir       Enable initial response in SASL authentication"    " -S, --show-error    "    "Show error. With -s, make curl show errors when they occur",    " -s, --silent        Silent mode. Don't output anything", diff --git a/src/tool_operate.c b/src/tool_operate.c index 3151f416f..19d0799e1 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -1320,6 +1320,10 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])          if(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 */          retry_sleep_default = (config->retry_delay) ?            config->retry_delay*1000L : RETRY_SLEEP_DEFAULT; /* ms */  | 
