diff options
| author | Simo Sorce <idra@samba.org> | 2006-06-04 05:28:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:08:52 -0500 |
| commit | ca5accf224dc3ef998235603797b519866b57b1c (patch) | |
| tree | 3d2790afbc47076c2b12611d5c1e5b20683b36c5 /source4/lib/ldb/ldb_ildap | |
| parent | b31c685ec293ef65bc33a474fc5a1d83545d4749 (diff) | |
| download | samba-ca5accf224dc3ef998235603797b519866b57b1c.tar.gz samba-ca5accf224dc3ef998235603797b519866b57b1c.tar.bz2 samba-ca5accf224dc3ef998235603797b519866b57b1c.zip | |
r16036: Add a couple of new functions to corretly deal with timeouts.
Check timeouts are correctly verified.
Some minor fixed and removal of unused code.
(This used to be commit b52e5d6a0cb1a32e62759eaa49ce3e4cc804cc92)
Diffstat (limited to 'source4/lib/ldb/ldb_ildap')
| -rw-r--r-- | source4/lib/ldb/ldb_ildap/ldb_ildap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c index 003c6c011e..4fc34ccdcf 100644 --- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c +++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c @@ -143,7 +143,7 @@ static void ildb_request_timeout(struct event_context *ev, struct timed_event *t DLIST_REMOVE(ac->req->conn->pending, ac->req); } - handle->status = LDB_ERR_OPERATIONS_ERROR; + handle->status = LDB_ERR_TIME_LIMIT_EXCEEDED; return; } @@ -759,7 +759,7 @@ static int ildb_init(struct ldb_module *module) req->controls = NULL; req->async.context = ildb; req->async.callback = ildb_rootdse_callback; - req->async.timeout = 60; + ldb_set_timeout(module->ldb, req, 60); ret = ildb_search(module, req); if (ret != LDB_SUCCESS) { |