Quanah Gibson-Mount pushed to branch master at openldap / OpenLDAP

Commits: 76b9c476 by Michael Kourlas at 2025-06-19T13:49:40+00:00 ITS#10330 do not poll socket in ldap_int_tls_start if no timeout set

This probably had no effect, but is unnecessary.

- - - - - 585e6aa9 by Michael Kourlas at 2025-06-19T13:49:40+00:00 ITS#10330 keep socket non-blocking during polling in ldap_int_tls_start

During TLS negotiation, if a timeout is set, ldap_int_tls_start sets the socket to non-blocking and calls ldap_int_poll in a loop if ldap_int_tls_connect does not succeed the first time it is called.

However, ldap_int_poll sets the socket back to blocking and we currently do not set it back to non-blocking. This means that a subsequent call to ldap_int_tls_connect may hang and the configured timeout will not be enforced. To fix this, we now set the socket back to non-blocking after ldap_int_poll is called.

- - - - -

1 changed file:

- libraries/libldap/tls2.c

View it on GitLab: https://git.openldap.org/openldap/openldap/-/compare/e77ab14f0c7547a40480425...