diff options
author | Daniel Stenberg <daniel@haxx.se> | 2015-06-18 16:57:38 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2015-06-18 16:57:38 +0200 |
commit | afbee791d5bdda3cfee0e23d0da2440bb94c9c50 (patch) | |
tree | bf667d4acbec0f1528c452d9919253e062f28e35 /src/tool_operate.c | |
parent | 2546134b9792079fc9892d7e44a8d8c015072a31 (diff) |
tool: always provide negotiate/kerberos options
libcurl can still be built with it, even if the tool is not. Maintain
independence!
Diffstat (limited to 'src/tool_operate.c')
-rw-r--r-- | src/tool_operate.c | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/src/tool_operate.c b/src/tool_operate.c index fea587bc9..4c6ff854c 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -1204,32 +1204,26 @@ static CURLcode operate_do(struct GlobalConfig *global, my_setopt_enum(curl, CURLOPT_FTP_SSL_CCC, (long)config->ftp_ssl_ccc_mode); -#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI) - { - /* TODO: Make this a run-time check instead of compile-time one. */ - - /* new in curl 7.19.4 */ - if(config->socks5_gssapi_service) - my_setopt_str(curl, CURLOPT_SOCKS5_GSSAPI_SERVICE, - config->socks5_gssapi_service); - - /* new in curl 7.19.4 */ - if(config->socks5_gssapi_nec) - my_setopt_str(curl, CURLOPT_SOCKS5_GSSAPI_NEC, - config->socks5_gssapi_nec); + /* new in curl 7.19.4 */ + if(config->socks5_gssapi_service) + my_setopt_str(curl, CURLOPT_SOCKS5_GSSAPI_SERVICE, + config->socks5_gssapi_service); + + /* new in curl 7.19.4 */ + if(config->socks5_gssapi_nec) + my_setopt_str(curl, CURLOPT_SOCKS5_GSSAPI_NEC, + config->socks5_gssapi_nec); + + /* new in curl 7.43.0 */ + if(config->proxy_service_name) + my_setopt_str(curl, CURLOPT_PROXY_SERVICE_NAME, + config->proxy_service_name); + + /* new in curl 7.43.0 */ + if(config->service_name) + my_setopt_str(curl, CURLOPT_SERVICE_NAME, + config->service_name); - /* new in curl 7.43.0 */ - if(config->proxy_service_name) - my_setopt_str(curl, CURLOPT_PROXY_SERVICE_NAME, - config->proxy_service_name); - - /* new in curl 7.43.0 */ - if(config->service_name) - my_setopt_str(curl, CURLOPT_SERVICE_NAME, - config->service_name); - - } -#endif /* curl 7.13.0 */ my_setopt_str(curl, CURLOPT_FTP_ACCOUNT, config->ftp_account); |