From: Howard Chu <hyc@openldap.org>
Date: Mon, 5 Feb 2007 10:10:24 +0000 (+0000)
Subject: Fairly sure this is what the TIMEOUT option should always have been for
X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8^2~80
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b4c2cf250d16b7226cb861dc556f06090ca0a926;p=openldap

Fairly sure this is what the TIMEOUT option should always have been for
---

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index 82686b3c96..05d7aece47 100644
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -275,6 +275,10 @@ wait4msg(
 	LDAP_PVT_THREAD_ASSERT_MUTEX_OWNER( &ld->ld_res_mutex );
 #endif
 
+	if ( timeout == NULL ) {
+		timeout = ld->ld_options.ldo_tm_api;
+	}
+
 #ifdef LDAP_DEBUG
 	if ( timeout == NULL ) {
 		Debug( LDAP_DEBUG_TRACE, "wait4msg ld %p msgid %d (infinite timeout)\n",