diff options
author | Simo Sorce <idra@samba.org> | 2006-03-03 22:52:57 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:52:14 -0500 |
commit | 8edf29e8ef4d886321a6e8ec3902065641d34f40 (patch) | |
tree | f0fbc9be4612e112ff5c611e0a83c3df26d6e596 /source4/lib/ldb/ldb_tdb/ldb_search.c | |
parent | e07f36a48cbc1b24192bddd3d27b164d52bfe31c (diff) | |
download | samba-8edf29e8ef4d886321a6e8ec3902065641d34f40.tar.gz samba-8edf29e8ef4d886321a6e8ec3902065641d34f40.tar.bz2 samba-8edf29e8ef4d886321a6e8ec3902065641d34f40.zip |
r13827: Minor enhancements or cosmetic changes
(This used to be commit 7ef63abae12f65835a82f9931ad1f5ea75e5f3f6)
Diffstat (limited to 'source4/lib/ldb/ldb_tdb/ldb_search.c')
-rw-r--r-- | source4/lib/ldb/ldb_tdb/ldb_search.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_search.c b/source4/lib/ldb/ldb_tdb/ldb_search.c index 5ffd45aa3b..5155031055 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_search.c +++ b/source4/lib/ldb/ldb_tdb/ldb_search.c @@ -522,7 +522,6 @@ int ltdb_search_async(struct ldb_module *module, const struct ldb_dn *base, const char * const *attrs, void *context, int (*callback)(struct ldb_context *, void *, struct ldb_async_result *), - int timeout, struct ldb_async_handle **handle) { struct ltdb_private *ltdb = talloc_get_type(module->private_data, struct ltdb_private); @@ -547,7 +546,7 @@ int ltdb_search_async(struct ldb_module *module, const struct ldb_dn *base, return LDB_ERR_OPERATIONS_ERROR; } - *handle = init_ltdb_handle(ltdb, module, context, callback, timeout); + *handle = init_ltdb_handle(ltdb, module, context, callback); if (*handle == NULL) { talloc_free(*handle); ltdb_unlock_read(module); @@ -594,14 +593,17 @@ int ltdb_search_bytree(struct ldb_module *module, const struct ldb_dn *base, ret = ltdb_search_async(module, base, scope, tree, attrs, res, <db_search_sync_callback, - 0, &handle); + &handle); - if (ret != LDB_SUCCESS) - return ret; + if (ret == LDB_SUCCESS) { + ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL); + talloc_free(handle); + } - ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL); + if (ret != LDB_SUCCESS) { + talloc_free(*res); + } - talloc_free(handle); return ret; } |