ph10 2004/11/17 16:31:45 GMT
Modified files:
exim-src/src/lookups ldap.c
Log:
Minor tidy to the recent LDAP fix to keep the code for Netscape SDK
unchanged (though I cannot test it).
Revision Changes Path
1.4 +6 -1 exim/exim-src/src/lookups/ldap.c
Index: ldap.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/lookups/ldap.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ldap.c 11 Nov 2004 12:05:54 -0000 1.3
+++ ldap.c 17 Nov 2004 16:31:45 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/lookups/ldap.c,v 1.3 2004/11/11 12:05:54 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/lookups/ldap.c,v 1.4 2004/11/17 16:31:45 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -380,8 +380,13 @@
#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 *)¬imeout);
}
#endif
