romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-23 18:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

oauth2: Don't use XOAUTH2 in OAuth 2.0 variables

Browse source
This commit is contained in:
Steve Holme 2015-09-04 07:11:09 +01:00
parent 4e3d396900
commit eaa98cef8d
8 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tool_cfgable.c
View file

@ -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);

2
src/tool_cfgable.h
View file

@ -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 */

2
src/tool_getparam.c
View file

@ -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);

4
src/tool_operate.c
View file

@ -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)
{

2
src/tool_paramhlp.c
View file

@ -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;