Minor tidy to the recent LDAP fix to keep the code for Netscape SDK

unchanged (though I cannot test it).

diff --git a/src/src/lookups/ldap.c b/src/src/lookups/ldap.c
index 33016457042ab0e8f4987bf0294f6529a4f7bee9..7a21e8e014ceb7e5affa32f92636d9a280081786 100644 (file)
--- a/src/src/lookups/ldap.c
+++ b/src/src/lookups/ldap.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/lookups/ldap.c,v 1.3 2004/11/11 12:05:54 ph10 Exp $ */
+/* $Cambridge: exim/src/src/lookups/ldap.c,v 1.4 2004/11/17 16:31:45 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -380,9 +380,14 @@ if (lcp == NULL)
   #ifdef LDAP_X_OPT_CONNECT_TIMEOUT
   if (tcplimit > 0)
     {
-    unsigned int timeout1000 = tcplimit*1000;
+    int timeout1000 = tcplimit*1000;
     ldap_set_option(ld, LDAP_X_OPT_CONNECT_TIMEOUT, (void *)&timeout1000);
     }
+  else
+    {
+    int notimeout = LDAP_X_IO_TIMEOUT_NO_TIMEOUT;
+    ldap_set_option(ld, LDAP_X_OPT_CONNECT_TIMEOUT, (void *)&notimeout);
+    }
   #endif
 
   /* Set the TCP connect timeout. This works with OpenLDAP 2.2.14. */