mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-12-21 06:50:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

openldap: fix STARTTLS

Browse Source 
It was not working anymore since introduction of connection filters.

Also do not attempt to recover from a failing TLS negotiation with
CURLUSESSL_TRY.

Closes #12610
This commit is contained in:
Patrick Monnerat 2023-12-30 17:31:04 +01:00 committed by Daniel Stenberg
parent d16d18cf64
commit 4b6d44f6e9
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/openldap.c
View File

@ -793,10 +793,13 @@ static CURLcode oldap_connecting(struct Curl_easy *data, bool *done)
result = oldap_perform_bind(data, OLDAP_BIND); result = oldap_perform_bind(data, OLDAP_BIND);
break; break;
} }
result = Curl_ssl_cfilter_add(data, conn, FIRSTSOCKET);
if(result)
break;
FALLTHROUGH(); FALLTHROUGH();
case OLDAP_TLS: case OLDAP_TLS:
result = oldap_ssl_connect(data, OLDAP_TLS); result = oldap_ssl_connect(data, OLDAP_TLS);
if(result && data->set.use_ssl != CURLUSESSL_TRY) if(result)
result = oldap_map_error(code, CURLE_USE_SSL_FAILED); result = oldap_map_error(code, CURLE_USE_SSL_FAILED);
else if(ssl_installed(conn)) { else if(ssl_installed(conn)) {
conn->bits.tls_upgraded = TRUE; conn->bits.tls_upgraded = TRUE;