From ccf7a826050fe33aace329b86d77895bdb7dd4c3 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sat, 9 Apr 2016 20:47:05 +0100 Subject: CURLOPT_SOCKS5_GSSAPI_SERVICE: Merged with CURLOPT_PROXY_SERVICE_NAME As these two options provide identical functionality, the former for SOCK5 proxies and the latter for HTTP proxies, merged the two options together. As such CURLOPT_SOCKS5_GSSAPI_SERVICE is marked as deprecated as of 7.49.0. --- src/tool_cfgable.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/tool_cfgable.h') 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 */ -- cgit v1.2.3