aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/tool_cfgable.c1
-rw-r--r--src/tool_cfgable.h10
-rw-r--r--src/tool_getparam.c9
-rw-r--r--src/tool_operate.c5
4 files changed, 8 insertions, 17 deletions
diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c
index 6c2aced55..4517714cd 100644
--- a/src/tool_cfgable.c
+++ b/src/tool_cfgable.c
@@ -137,7 +137,6 @@ static void free_config_fields(struct OperationConfig *config)
curl_slist_free_all(config->resolve);
Curl_safefree(config->socksproxy);
- Curl_safefree(config->socks5_gssapi_service);
Curl_safefree(config->proxy_service_name);
Curl_safefree(config->service_name);
diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h
index fba5617ad..ba91062c6 100644
--- a/src/tool_cfgable.h
+++ b/src/tool_cfgable.h
@@ -165,12 +165,10 @@ struct OperationConfig {
char *socksproxy; /* set to server string */
int socksver; /* set to CURLPROXY_SOCKS* define */
- char *socks5_gssapi_service; /* set service name for gssapi principal
- * default rcmd */
- char *proxy_service_name; /* set service name for proxy negotiation
- * default HTTP */
- int socks5_gssapi_nec ; /* The NEC reference server does not protect
- * the encryption type exchange */
+ int socks5_gssapi_nec; /* The NEC reference server does not protect the
+ encryption type exchange */
+ char *proxy_service_name; /* set authentication service name for HTTP and
+ SOCKS5 proxies */
char *service_name; /* set authentication service name for DIGEST-MD5,
Kerberos 5 and SPNEGO */
diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index cf848c6d7..70290d19e 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -158,7 +158,6 @@ static const struct LongShort aliases[]= {
{"$3", "keepalive-time", TRUE},
{"$4", "post302", FALSE},
{"$5", "noproxy", TRUE},
- {"$6", "socks5-gssapi-service", TRUE},
{"$7", "socks5-gssapi-nec", FALSE},
{"$8", "proxy1.0", TRUE},
{"$9", "tftp-blksize", TRUE},
@@ -176,6 +175,9 @@ static const struct LongShort aliases[]= {
{"$L", "test-event", FALSE},
{"$M", "unix-socket", TRUE},
{"$N", "path-as-is", FALSE},
+ {"$O", "socks5-gssapi-service", TRUE},
+ /* 'socks5-gssapi-service' merged with'proxy-service-name' and
+ deprecated since 7.49.0 */
{"$O", "proxy-service-name", TRUE},
{"$P", "service-name", TRUE},
{"$Q", "proto-default", TRUE},
@@ -901,10 +903,7 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
/* This specifies the noproxy list */
GetStr(&config->noproxy, nextarg);
break;
- case '6': /* --socks5-gssapi-service */
- GetStr(&config->socks5_gssapi_service, nextarg);
- break;
- case '7': /* --socks5-gssapi-nec*/
+ case '7': /* --socks5-gssapi-nec*/
config->socks5_gssapi_nec = toggle;
break;
case '8': /* --proxy1.0 */
diff --git a/src/tool_operate.c b/src/tool_operate.c
index 0387e9dcf..c8bf12bb2 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -1210,11 +1210,6 @@ static CURLcode operate_do(struct GlobalConfig *global,
(long)config->ftp_ssl_ccc_mode);
/* 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);