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/dsdb/samdb/ldb_modules/extended_dn.c | |
| 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/dsdb/samdb/ldb_modules/extended_dn.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/extended_dn.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn.c b/source4/dsdb/samdb/ldb_modules/extended_dn.c index 1f2d406a28..71f7a2dc7e 100644 --- a/source4/dsdb/samdb/ldb_modules/extended_dn.c +++ b/source4/dsdb/samdb/ldb_modules/extended_dn.c @@ -172,7 +172,6 @@ struct extended_async_context { struct ldb_module *module; void *up_context; int (*up_callback)(struct ldb_context *, void *, struct ldb_async_result *); - int timeout; const char * const *attrs; BOOL remove_guid; @@ -236,7 +235,6 @@ static int extended_search_async(struct ldb_module *module, struct ldb_request * ac->module = module; ac->up_context = req->async.context; ac->up_callback = req->async.callback; - ac->timeout = req->async.timeout; ac->attrs = req->op.search.attrs; ac->remove_guid = False; ac->remove_sid = False; @@ -289,7 +287,7 @@ static int extended_search_async(struct ldb_module *module, struct ldb_request * down_req->async.context = ac; down_req->async.callback = extended_async_callback; - down_req->async.timeout = req->async.timeout; + ldb_set_timeout_from_prev_req(module->ldb, req, down_req); /* perform the search */ ret = ldb_next_request(module, down_req); |