summaryrefslogtreecommitdiff
path: root/source4/lib/ldb
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-07-18 12:11:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:10:13 -0500
commit761450c66e92efb2570b5aaa038178d426323cce (patch)
tree3e80d0e7481ea1cb45803f7e9df3e9f7143c51bc /source4/lib/ldb
parente3fd9ccd4e8d8dfcef1ef2f475de271e28b79a57 (diff)
downloadsamba-761450c66e92efb2570b5aaa038178d426323cce.tar.gz
samba-761450c66e92efb2570b5aaa038178d426323cce.tar.bz2
samba-761450c66e92efb2570b5aaa038178d426323cce.zip
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)
Diffstat (limited to 'source4/lib/ldb')
-rw-r--r--source4/lib/ldb/ldb_ldap/ldb_ldap.c3
1 files changed, 2 insertions, 1 deletions
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 <ldap.h>
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;
}