Commit 97c272e5 authored by Linus Nielsen's avatar Linus Nielsen Committed by Daniel Stenberg
Browse files

Negotiate: custom service names for SPNEGO. 

* Add new options, CURLOPT_PROXY_SERVICE_NAME and CURLOPT_SERVICE_NAME.
* Add new curl options, --proxy-service-name and --service-name.
parent 54c39469

docs/curl.1

+10 −0
Original line number Diff line number Diff line
@@ -1332,6 +1332,11 @@ with a remote host. (Added in 7.17.1) 
.IP "--proxy-ntlm"

Tells curl to use HTTP NTLM authentication when communicating with the given

proxy. Use \fI--ntlm\fP for enabling NTLM with a remote host.

.IP "--proxy-service-name <servicename>"

This option allows you to change the service name for proxy negotiation.



Examples: --proxy-negotiate proxy-name \fI--proxy-service-name\fP sockd would use

sockd/proxy-name.  (Added in 7.43.0).

.IP "--proxy1.0 <proxyhost[:port]>"

Use the specified HTTP 1.0 proxy. If the port number is not specified, it is

assumed at port 1080.
@@ -1513,6 +1518,11 @@ terminal/stdout unless you redirect it. 
.IP "--sasl-ir"

Enable initial response in SASL authentication.

(Added in 7.31.0)

.IP "--service-name <servicename>"

This option allows you to change the service name for SPNEGO.



Examples: --negotiate \fI--service-name\fP sockd would use

sockd/server-name.  (Added in 7.43.0).

.IP "-S, --show-error"

When used with \fI-s\fP it makes curl show an error message if it fails.

.IP "--ssl"

docs/libcurl/curl_easy_setopt.3

+4 −0
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ Tunnel through the HTTP proxy. \fICURLOPT_HTTPPROXYTUNNEL(3)\fP 
Socks5 GSSAPI service name. \fICURLOPT_SOCKS5_GSSAPI_SERVICE(3)\fP

.IP CURLOPT_SOCKS5_GSSAPI_NEC

Socks5 GSSAPI NEC mode. See \fICURLOPT_SOCKS5_GSSAPI_NEC(3)\fP

.IP CURLOPT_PROXY_SERVICE_NAME

Proxy service name. \fICURLOPT_PROXY_SERVICE_NAME(3)\fP

.IP CURLOPT_SERVICE_NAME

SPNEGO service name. \fICURLOPT_SERVICE_NAME(3)\fP

.IP CURLOPT_INTERFACE

Bind connection locally to this. See \fICURLOPT_INTERFACE(3)\fP

.IP CURLOPT_LOCALPORT

docs/libcurl/opts/CURLOPT_PROXY_SERVICE_NAME.3

0 → 100644
+46 −0
Original line number Diff line number Diff line 
.\" **************************************************************************

.\" *                                  _   _ ____  _

.\" *  Project                     ___| | | |  _ \| |

.\" *                             / __| | | | |_) | |

.\" *                            | (__| |_| |  _ <| |___

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

.\" *

.\" * Copyright (C) 1998 - 2015, 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

.\" * are also available at http://curl.haxx.se/docs/copyright.html.

.\" *

.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell

.\" * copies of the Software, and permit persons to whom the Software is

.\" * furnished to do so, under the terms of the COPYING file.

.\" *

.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

.\" * KIND, either express or implied.

.\" *

.\" **************************************************************************

.\"

.TH CURLOPT_PROXY_SERVICE_NAME 3 "17 Jun 2015" "libcurl 7.43.0" "curl_easy_setopt options"

.SH NAME

CURLOPT_PROXY_SERVICE_NAME \- proxy service name

.SH SYNOPSIS

#include <curl/curl.h>



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 "rcmd" (for a SOCKS5 server). This option

allows you to change it.

..SH DEFAULT

See above

.SH PROTOCOLS

Most

.SH EXAMPLE

TODO

.SH AVAILABILITY

Added in 7.43.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.

.SH "SEE ALSO"

.BR CURLOPT_PROXY "(3), " CURLOPT_PROXYTYPE "(3), "

docs/libcurl/opts/CURLOPT_SERVICE_NAME.3

0 → 100644
+46 −0
Original line number Diff line number Diff line 
.\" **************************************************************************

.\" *                                  _   _ ____  _

.\" *  Project                     ___| | | |  _ \| |

.\" *                             / __| | | | |_) | |

.\" *                            | (__| |_| |  _ <| |___

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

.\" *

.\" * Copyright (C) 1998 - 2015, 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

.\" * are also available at http://curl.haxx.se/docs/copyright.html.

.\" *

.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell

.\" * copies of the Software, and permit persons to whom the Software is

.\" * furnished to do so, under the terms of the COPYING file.

.\" *

.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

.\" * KIND, either express or implied.

.\" *

.\" **************************************************************************

.\"

.TH CURLOPT_SERVICE_NAME 3 "17 Jun 2015" "libcurl 7.43.0" "curl_easy_setopt options"

.SH NAME

CURLOPT_SERVICE_NAME \- SPNEGO service name

.SH SYNOPSIS

#include <curl/curl.h>



CURLcode curl_easy_setopt(CURL *handle, CURLOPT_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.

..SH DEFAULT

See above

.SH PROTOCOLS

Most

.SH EXAMPLE

TODO

.SH AVAILABILITY

Added in 7.43.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.

.SH "SEE ALSO"

.BR CURLOPT_PROXY "(3), " CURLOPT_PROXYTYPE "(3), "

docs/libcurl/symbols-in-versions

+2 −0
Original line number Diff line number Diff line
@@ -454,6 +454,7 @@ CURLOPT_PROXYPORT 7.1 
CURLOPT_PROXYTYPE               7.10

CURLOPT_PROXYUSERNAME           7.19.1

CURLOPT_PROXYUSERPWD            7.1

CURLOPT_PROXY_SERVICE_NAME      7.43.0

CURLOPT_PROXY_TRANSFER_MODE     7.18.0

CURLOPT_PUT                     7.1

CURLOPT_QUOTE                   7.1
@@ -477,6 +478,7 @@ CURLOPT_SASL_IR 7.31.0 
CURLOPT_SEEKDATA                7.18.0

CURLOPT_SEEKFUNCTION            7.18.0

CURLOPT_SERVER_RESPONSE_TIMEOUT 7.20.0

CURLOPT_SERVICE_NAME            7.43.0

CURLOPT_SHARE                   7.10

CURLOPT_SOCKOPTDATA             7.16.0

CURLOPT_SOCKOPTFUNCTION         7.16.0