From 3c929ff9f6ea328f304c04ab4214dc879cea4638 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sun, 25 Aug 2013 22:32:34 +0100 Subject: curl: Moved check for password out of get parameter loop Moved the calls to checkpasswd() out of the getparameter() function which allows for any related arguments to be specified on the command line before or after --user (and --proxy-user). For example: --bearer doesn't need to be specified before --user to prevent curl from asking for an unnecessary password as is the case with commit e7dcc454c67a2f. --- src/tool_getparam.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/tool_getparam.c') diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 813cc70c0..b5068ac5f 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -1633,22 +1633,14 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ } break; case 'u': - /* user:password */ + /* user:password;options */ GetStr(&config->userpwd, nextarg); cleanarg(nextarg); - if(!config->xoauth2_bearer) { - err = checkpasswd("host", &config->userpwd); - if(err) - return err; - } break; case 'U': /* Proxy user:password */ GetStr(&config->proxyuserpwd, nextarg); cleanarg(nextarg); - err = checkpasswd("proxy", &config->proxyuserpwd); - if(err) - return err; break; case 'v': if(toggle) { -- cgit v1.2.3