From 761450c66e92efb2570b5aaa038178d426323cce Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 18 Jul 2006 12:11:02 +0000 Subject: r17112: - 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 (This used to be commit ac9d69d2574e8331b3ce9c3b97922ead9165fa79) --- source4/lib/ldb/ldb_ldap/ldb_ldap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4') diff --git a/source4/lib/ldb/ldb_ldap/ldb_ldap.c b/source4/lib/ldb/ldb_ldap/ldb_ldap.c index 13f891108a..3df137efaf 100644 --- a/source4/lib/ldb/ldb_ldap/ldb_ldap.c +++ b/source4/lib/ldb/ldb_ldap/ldb_ldap.c @@ -42,6 +42,7 @@ #include "includes.h" #include "ldb/include/includes.h" +#define LDAP_DEPRECATED 1 #include struct lldb_private { @@ -664,7 +665,7 @@ static int lldb_async_wait(struct ldb_async_handle *handle, enum ldb_async_wait_ 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; } -- cgit