diff options
author | Patrick Monnerat <patrick@monnerat.net> | 2021-11-30 17:48:28 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2021-12-06 07:53:04 +0100 |
commit | a40160aee83acae504fd4b30e39c28ff8dbab24c (patch) | |
tree | 9039a6c31884f3052795c11a82c11b463f874435 /docs | |
parent | a6e2643433565abf17a2e3edda184aa1a99690ac (diff) | |
download | curl-a40160aee83acae504fd4b30e39c28ff8dbab24c.tar.gz |
openldap: implement STARTTLS
As this introduces use of CURLOPT_USE_SSL option for LDAP, also check
this option in ldap.c as it is not supported by this backend.
Closes #8065
Diffstat (limited to 'docs')
-rw-r--r-- | docs/cmdline-opts/ssl-reqd.d | 6 | ||||
-rw-r--r-- | docs/cmdline-opts/ssl.d | 8 | ||||
-rw-r--r-- | docs/libcurl/opts/CURLOPT_USE_SSL.3 | 6 |
3 files changed, 16 insertions, 4 deletions
diff --git a/docs/cmdline-opts/ssl-reqd.d b/docs/cmdline-opts/ssl-reqd.d index 81e0ea794..fb9a1aa83 100644 --- a/docs/cmdline-opts/ssl-reqd.d +++ b/docs/cmdline-opts/ssl-reqd.d @@ -1,6 +1,6 @@ Long: ssl-reqd Help: Require SSL/TLS -Protocols: FTP IMAP POP3 SMTP +Protocols: FTP IMAP POP3 SMTP LDAP Added: 7.20.0 Category: tls Example: --ssl-reqd ftp://example.com @@ -9,4 +9,8 @@ See-also: ssl insecure Require SSL/TLS for the connection. Terminates the connection if the server does not support SSL/TLS. +This option is handled in LDAP since version 7.81.0. It is fully supported +by the openldap backend and rejected by the generic ldap backend if explicit +TLS is required. + This option was formerly known as --ftp-ssl-reqd. diff --git a/docs/cmdline-opts/ssl.d b/docs/cmdline-opts/ssl.d index 96e4169aa..83cac5c9d 100644 --- a/docs/cmdline-opts/ssl.d +++ b/docs/cmdline-opts/ssl.d @@ -1,6 +1,6 @@ Long: ssl Help: Try SSL/TLS -Protocols: FTP IMAP POP3 SMTP +Protocols: FTP IMAP POP3 SMTP LDAP Added: 7.20.0 Category: tls Example: --ssl pop3://example.com/ @@ -10,5 +10,11 @@ Try to use SSL/TLS for the connection. Reverts to a non-secure connection if the server does not support SSL/TLS. See also --ftp-ssl-control and --ssl-reqd for different levels of encryption required. +This option is handled in LDAP since version 7.81.0. It is fully supported +by the openldap backend and ignored by the generic ldap backend. + +Please note that a server may close the connection if the negotiation does +not succeed. + This option was formerly known as --ftp-ssl (Added in 7.11.0). That option name can still be used but will be removed in a future version. diff --git a/docs/libcurl/opts/CURLOPT_USE_SSL.3 b/docs/libcurl/opts/CURLOPT_USE_SSL.3 index 767be1f36..3fcc2dfc5 100644 --- a/docs/libcurl/opts/CURLOPT_USE_SSL.3 +++ b/docs/libcurl/opts/CURLOPT_USE_SSL.3 @@ -40,7 +40,8 @@ This is for enabling SSL/TLS when you use FTP, SMTP, POP3, IMAP etc. .IP CURLUSESSL_NONE do not attempt to use SSL. .IP CURLUSESSL_TRY -Try using SSL, proceed as normal otherwise. +Try using SSL, proceed as normal otherwise. Note that server may close the +connection if the negotiation does not succeed. .IP CURLUSESSL_CONTROL Require SSL for the control connection or fail with \fICURLE_USE_SSL_FAILED\fP. .IP CURLUSESSL_ALL @@ -48,7 +49,7 @@ Require SSL for all communication or fail with \fICURLE_USE_SSL_FAILED\fP. .SH DEFAULT CURLUSESSL_NONE .SH PROTOCOLS -FTP, SMTP, POP3, IMAP +FTP, SMTP, POP3, IMAP, LDAP .SH EXAMPLE .nf CURL *curl = curl_easy_init(); @@ -65,6 +66,7 @@ if(curl) { .SH AVAILABILITY Added in 7.11.0. This option was known as CURLOPT_FTP_SSL up to 7.16.4, and the constants were known as CURLFTPSSL_* +Handled by LDAP since 7.81.0. Fully supported by the openldap backend only. .SH RETURN VALUE Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not. .SH "SEE ALSO" |