diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2016-04-09 20:47:05 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2016-04-09 20:47:05 +0100 |
| commit | ccf7a826050fe33aace329b86d77895bdb7dd4c3 (patch) | |
| tree | f5376feddba49724c6903c30e136b8639e983801 /lib/socks_gssapi.c | |
| parent | 830a4e55a278cfd003906140a52a9680be87d3f7 (diff) | |
| download | curl-ccf7a826050fe33aace329b86d77895bdb7dd4c3.tar.gz | |
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.
Diffstat (limited to 'lib/socks_gssapi.c')
| -rw-r--r-- | lib/socks_gssapi.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 * +----+------+-----+----------------+ |