mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-15 03:01:09 +08:00
ITS#8675 - Fix tools to not continue on TLS error
The spec says that upon StartTLS 'success', both TLS communications is established on the octet following the Start TLS response (and the request)... and that once one starts TLS communications, one can never go back to LDAP without TLS. So if there's a TLS failure (whether as part of TLS nego or later), LDAP communications cannot be continued (without TLS). Only ignoring LDAP errors (rc > 0) ensures that if TLS negotiation fails, we don't attempt to send LDAP operations without TLS.
This commit is contained in:
parent
f4bfb5e0a5
commit
23af2c36e2
@ -1451,7 +1451,7 @@ dnssrv_free:;
|
||||
ldap_get_option( ld, LDAP_OPT_DIAGNOSTIC_MESSAGE, (void*)&msg);
|
||||
tool_perror( "ldap_start_tls", rc, NULL, NULL, msg, NULL );
|
||||
ldap_memfree(msg);
|
||||
if ( use_tls > 1 ) {
|
||||
if ( use_tls > 1 || rc < 0 ) {
|
||||
tool_exit( ld, EXIT_FAILURE );
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user