diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2015-09-04 07:11:09 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2015-11-09 22:25:08 +0000 |
| commit | eaa98cef8d31e40327c4db672d401578733140d2 (patch) | |
| tree | d196cbefae3756d1eb845def076d62cfd4fc1041 /src | |
| parent | 4e3d39690079121e173bd0319e1fa61bc95d31a3 (diff) | |
| download | curl-eaa98cef8d31e40327c4db672d401578733140d2.tar.gz | |
oauth2: Don't use XOAUTH2 in OAuth 2.0 variables
Diffstat (limited to 'src')
| -rw-r--r-- | src/tool_cfgable.c | 2 | ||||
| -rw-r--r-- | src/tool_cfgable.h | 2 | ||||
| -rw-r--r-- | src/tool_getparam.c | 2 | ||||
| -rw-r--r-- | src/tool_operate.c | 4 | ||||
| -rw-r--r-- | src/tool_paramhlp.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c index 64f15ca27..6cd22815a 100644 --- a/src/tool_cfgable.c +++ b/src/tool_cfgable.c @@ -114,7 +114,7 @@ static void free_config_fields(struct OperationConfig *config) Curl_safefree(config->customrequest); Curl_safefree(config->krblevel); - Curl_safefree(config->xoauth2_bearer); + Curl_safefree(config->oauth_bearer); Curl_safefree(config->unix_socket_path); Curl_safefree(config->writeout); diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h index c3db4c191..85b8bcfee 100644 --- a/src/tool_cfgable.h +++ b/src/tool_cfgable.h @@ -208,7 +208,7 @@ struct OperationConfig { #ifdef CURLDEBUG bool test_event_based; #endif - char *xoauth2_bearer; /* OAuth 2.0 bearer token */ + char *oauth_bearer; /* OAuth 2.0 bearer token */ bool nonpn; /* enable/disable TLS NPN extension */ bool noalpn; /* enable/disable TLS ALPN extension */ char *unix_socket_path; /* path to Unix domain socket */ diff --git a/src/tool_getparam.c b/src/tool_getparam.c index c84cc2646..fd20cdc26 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -496,7 +496,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ GetStr(&config->egd_file, nextarg); break; case 'B': /* OAuth 2.0 bearer token */ - GetStr(&config->xoauth2_bearer, nextarg); + GetStr(&config->oauth_bearer, nextarg); break; case 'c': /* connect-timeout */ err = str2udouble(&config->connecttimeout, nextarg); diff --git a/src/tool_operate.c b/src/tool_operate.c index 41a71dd73..4a67c0967 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -851,8 +851,8 @@ static CURLcode operate_do(struct GlobalConfig *global, else if(!config->use_metalink) my_setopt(curl, CURLOPT_HEADER, config->include_headers?1L:0L); - if(config->xoauth2_bearer) - my_setopt_str(curl, CURLOPT_XOAUTH2_BEARER, config->xoauth2_bearer); + if(config->oauth_bearer) + my_setopt_str(curl, CURLOPT_XOAUTH2_BEARER, config->oauth_bearer); #if !defined(CURL_DISABLE_PROXY) { diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c index 28872e678..c26754aeb 100644 --- a/src/tool_paramhlp.c +++ b/src/tool_paramhlp.c @@ -519,7 +519,7 @@ CURLcode get_args(struct OperationConfig *config, const size_t i) bool last = (config->next ? FALSE : TRUE); /* Check we have a password for the given host user */ - if(config->userpwd && !config->xoauth2_bearer) { + if(config->userpwd && !config->oauth_bearer) { result = checkpasswd("host", i, last, &config->userpwd); if(result) return result; |