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 82686b3c963cd1a41078c138a9972eabd44512cb..05d7aece47e66c37e2216cb511a0b910689b31d6 100644 (file)
--- 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",