]> git.ipfire.org Git - thirdparty/openldap.git/commitdiff
ITS#10330 do not poll socket in ldap_int_tls_start if no timeout set
authorMichael Kourlas <michael.kourlas@solace.com>
Fri, 30 May 2025 21:56:49 +0000 (17:56 -0400)
committerQuanah Gibson-Mount <quanah@openldap.org>
Thu, 19 Jun 2025 13:49:40 +0000 (13:49 +0000)
This probably had no effect, but is unnecessary.

libraries/libldap/tls2.c

index 0841005a599659637cbb67492fd97db9a93efec9..3a07aa0edd089346e2dec1370185c88dbab73941 100644 (file)
@@ -1172,7 +1172,7 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
                if ( async ) {
                        ld->ld_errno = LDAP_X_CONNECTING;
                        return (ld->ld_errno);
-               } else {
+               } else if ( ld->ld_options.ldo_tm_net.tv_sec >= 0 ) {
                        struct timeval curr_time_tv, delta_tv;
                        int wr=0;