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. --- lib/socks_gssapi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/socks_gssapi.c') diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c index 09457aecd..e3fc260cb 100644 --- a/lib/socks_gssapi.c +++ b/lib/socks_gssapi.c @@ -120,7 +120,8 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, unsigned short us_length; char *user=NULL; unsigned char socksreq[4]; /* room for GSS-API exchange header only */ - char *serviceptr = data->set.str[STRING_SOCKS5_GSSAPI_SERVICE]; + const char *serviceptr = data->set.str[STRING_PROXY_SERVICE_NAME] ? + data->set.str[STRING_PROXY_SERVICE_NAME] : "rcmd"; /* GSS-API request looks like * +----+------+-----+----------------+ -- cgit v1.2.1