diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tool_getparam.c | 4 | ||||
| -rw-r--r-- | src/tool_help.c | 6 | ||||
| -rw-r--r-- | src/tool_operate.c | 44 |
3 files changed, 20 insertions, 34 deletions
diff --git a/src/tool_getparam.c b/src/tool_getparam.c index c86e6b4b1..339fb7b5d 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -158,12 +158,10 @@ static const struct LongShort aliases[]= { {"$3", "keepalive-time", TRUE}, {"$4", "post302", FALSE}, {"$5", "noproxy", TRUE}, -#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI) {"$6", "socks5-gssapi-service", TRUE}, {"$7", "socks5-gssapi-nec", FALSE}, {"$O", "proxy-service-name", TRUE}, {"$P", "service-name", TRUE}, -#endif {"$8", "proxy1.0", TRUE}, {"$9", "tftp-blksize", TRUE}, {"$A", "mail-from", TRUE}, @@ -898,7 +896,6 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ /* This specifies the noproxy list */ GetStr(&config->noproxy, nextarg); break; -#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI) case '6': /* --socks5-gssapi-service */ GetStr(&config->socks5_gssapi_service, nextarg); break; @@ -911,7 +908,6 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ case 'P': /* --service-name */ GetStr(&config->service_name, nextarg); break; -#endif case '8': /* --proxy1.0 */ /* http 1.0 proxy */ GetStr(&config->proxy, nextarg); diff --git a/src/tool_help.c b/src/tool_help.c index 46ae341fe..59273036e 100644 --- a/src/tool_help.c +++ b/src/tool_help.c @@ -174,10 +174,8 @@ static const char *const helptext[] = { " --proxy-negotiate " "Use HTTP Negotiate (SPNEGO) authentication on the proxy (H)", " --proxy-ntlm Use NTLM authentication on the proxy (H)", -#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI) " --proxy-service-name NAME SPNEGO proxy service name", " --service-name NAME SPNEGO service name", -#endif " -U, --proxy-user USER[:PASSWORD] Proxy user and password", " --proxy1.0 HOST[:PORT] Use HTTP/1.0 proxy on given port", " -p, --proxytunnel Operate through a HTTP proxy tunnel (using CONNECT)", @@ -206,10 +204,8 @@ static const char *const helptext[] = { " --socks5 HOST[:PORT] SOCKS5 proxy on given host + port", " --socks5-hostname HOST[:PORT] " "SOCKS5 proxy, pass host name to proxy", -#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI) " --socks5-gssapi-service NAME SOCKS5 proxy service name for GSS-API", " --socks5-gssapi-nec Compatibility with NEC SOCKS5 server", -#endif " -Y, --speed-limit RATE " "Stop transfers below RATE for 'speed-time' secs", " -y, --speed-time SECONDS " @@ -224,7 +220,7 @@ static const char *const helptext[] = { " -t, --telnet-option OPT=VAL Set telnet option", " --tftp-blksize VALUE Set TFTP BLKSIZE option (must be >512)", " -z, --time-cond TIME Transfer based on a time condition", - " -1, --tlsv1 Use => TLSv1 (SSL)", + " -1, --tlsv1 Use >= TLSv1 (SSL)", " --tlsv1.0 Use TLSv1.0 (SSL)", " --tlsv1.1 Use TLSv1.1 (SSL)", " --tlsv1.2 Use TLSv1.2 (SSL)", 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); |