svn commit: samba r17112 - in branches/SAMBA_4_0/source/lib/ldb/ldb_ldap: .

[metze at samba.org]

Author: metze
Date: 2006-07-18 12:11:02 +0000 (Tue, 18 Jul 2006)
New Revision: 17112

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17112

Log:
- fix the build of the ldap ldb backend with newer openldap header files.
- use the correct timeout variable (simo you should do a standalone build before commiting:-)

metze
Modified:
   branches/SAMBA_4_0/source/lib/ldb/ldb_ldap/ldb_ldap.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_ldap/ldb_ldap.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_ldap/ldb_ldap.c	2006-07-18 11:56:46 UTC (rev 17111)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_ldap/ldb_ldap.c	2006-07-18 12:11:02 UTC (rev 17112)
@@ -42,6 +42,7 @@
 #include "includes.h"
 #include "ldb/include/includes.h"
 
+#define LDAP_DEPRECATED 1
 #include <ldap.h>
 
 struct lldb_private {
@@ -664,7 +665,7 @@
 	case LDB_WAIT_NONE:
 
 		if ((ac->timeout != -1) &&
-		    ((ac->starttime + timeout) > time(NULL))) {
+		    ((ac->starttime + ac->timeout) > time(NULL))) {
 			return LDB_ERR_TIME_LIMIT_EXCEEDED;
 		}