From: Michael Kourlas <michael.kourlas@solace.com>
Date: Fri, 30 May 2025 21:56:49 +0000 (-0400)
Subject: ITS#10330 do not poll socket in ldap_int_tls_start if no timeout set
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76b9c476dd59c63a9a1bdff6133a7fed24954fd2;p=thirdparty%2Fopenldap.git

ITS#10330 do not poll socket in ldap_int_tls_start if no timeout set

This probably had no effect, but is unnecessary.
---

diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
index 0841005a59..3a07aa0edd 100644
--- a/libraries/libldap/tls2.c
+++ b/libraries/libldap/tls2.c
@@ -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;