Commit ccf7a826 authored by Steve Holme's avatar Steve Holme
Browse files

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.
parent 830a4e55

docs/libcurl/opts/CURLOPT_PROXY_SERVICE_NAME.3

+3 −2
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ CURLOPT_PROXY_SERVICE_NAME \- proxy authentication service name 
CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXY_SERVICE_NAME, char *name);

.SH DESCRIPTION

Pass a char * as parameter to a string holding the \fIname\fP of the

service. The default service name is "HTTP". This option allows you to change it.

service. The default service name is "HTTP" for HTTP based proxies and "rcmd"

for SOCKS5. This option allows you to change it.

.SH DEFAULT

See above

.SH PROTOCOLS
@@ -37,7 +38,7 @@ All network protocols 
.SH EXAMPLE

TODO

.SH AVAILABILITY

Added in 7.43.0

Added in 7.43.0 for HTTP proxies, 7.49.0 for SOCKS5 proxies.

.SH RETURN VALUE

Returns CURLE_OK if the option is supported, CURLE_UNKNOWN_OPTION if not, or

CURLE_OUT_OF_MEMORY if there was insufficient heap space.

docs/libcurl/opts/CURLOPT_SOCKS5_GSSAPI_SERVICE.3

+9 −7
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
.\" *                            | (__| |_| |  _ <| |___

.\" *                             \___|\___/|_| \_\_____|

.\" *

.\" * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

.\" * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

.\" *

.\" * This software is licensed as described in the file COPYING, which

.\" * you should have received as part of this distribution. The terms
@@ -22,23 +22,25 @@ 
.\"

.TH CURLOPT_SOCKS5_GSSAPI_SERVICE 3 "19 Jun 2014" "libcurl 7.37.0" "curl_easy_setopt options"

.SH NAME

CURLOPT_SOCKS5_GSSAPI_SERVICE \- proxy socks gssapi service name

CURLOPT_SOCKS5_GSSAPI_SERVICE \- SOCKS5 proxy authentication service name

.SH SYNOPSIS

#include <curl/curl.h>



CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SOCKS5_GSSAPI_SERVICE, char *name);

.SH DESCRIPTION

Pass a char * as parameter to a string holding the \fIname\fP of the

service. The default service name for a SOCKS5 server is

rcmd/server-fqdn. This option allows you to change it.

Deprecated since 7.49.0. Use \CURLOPT_PROXY_SERVICE_NAME(3)\fP instead.



Pass a char * as parameter to a string holding the \fIname\fP of the service.

The default service name for a SOCKS5 server is "rcmd". This option allows you

to change it.

.SH DEFAULT

See above

.SH PROTOCOLS

Most

All network protocols

.SH EXAMPLE

TODO

.SH AVAILABILITY

Added in 7.19.4

Added in 7.19.4, deprecated in 7.49.0

.SH RETURN VALUE

Returns CURLE_OK if the option is supported, CURLE_UNKNOWN_OPTION if not, or

CURLE_OUT_OF_MEMORY if there was insufficient heap space.

docs/libcurl/symbols-in-versions

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ CURLOPT_SHARE 7.10 
CURLOPT_SOCKOPTDATA             7.16.0

CURLOPT_SOCKOPTFUNCTION         7.16.0

CURLOPT_SOCKS5_GSSAPI_NEC       7.19.4

CURLOPT_SOCKS5_GSSAPI_SERVICE   7.19.4

CURLOPT_SOCKS5_GSSAPI_SERVICE   7.19.4        7.49.0

CURLOPT_SOURCE_HOST             7.12.1        -           7.15.5

CURLOPT_SOURCE_PATH             7.12.1        -           7.15.5

CURLOPT_SOURCE_PORT             7.12.1        -           7.15.5

include/curl/curl.h

+1 −1
Original line number Diff line number Diff line
@@ -1462,7 +1462,7 @@ typedef enum { 
  CINIT(TFTP_BLKSIZE, LONG, 178),



  /* Socks Service */

  CINIT(SOCKS5_GSSAPI_SERVICE, STRINGPOINT, 179),

  CINIT(SOCKS5_GSSAPI_SERVICE, STRINGPOINT, 179), /* DEPRECATED, do not use! */



  /* Socks Service */

  CINIT(SOCKS5_GSSAPI_NEC, LONG, 180),

lib/socks_gssapi.c

+2 −1
Original line number Diff line number Diff line
@@ -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

   * +----+------+-----+----------------+