summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/ldb_tdb/ldb_index.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-01-31 11:16:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:39 -0500
commitb60415745a0038dbfdca752861201fba0d942ff6 (patch)
tree3d4f30b520a7c48241c37d0f95d1ab30e473d89a /source4/lib/ldb/ldb_tdb/ldb_index.c
parentf9316daa4697bea13d2795c95a1486119de56e67 (diff)
downloadsamba-b60415745a0038dbfdca752861201fba0d942ff6.tar.gz
samba-b60415745a0038dbfdca752861201fba0d942ff6.tar.bz2
samba-b60415745a0038dbfdca752861201fba0d942ff6.zip
r13258: Fix the talloc heirachy for ldb_tdb.
In the return value res->msgs, msgs was not a child of res, in the indexed path. Instead, it hung directly off the ldb, which was sometimes a long-term context. Also remove unused parameters. Found by --leak-report-full Andrew Bartlett (This used to be commit 29cb5af827c459758997c80dca034d471bb92449)
Diffstat (limited to 'source4/lib/ldb/ldb_tdb/ldb_index.c')
-rw-r--r--source4/lib/ldb/ldb_tdb/ldb_index.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/source4/lib/ldb/ldb_tdb/ldb_index.c
index 93d0ebd6e9..c74ce62fbf 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_index.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_index.c
@@ -665,7 +665,8 @@ static int ldb_index_filter(struct ldb_module *module, struct ldb_parse_tree *tr
ret = 0;
if (ldb_match_msg(module->ldb, msg, tree, base, scope) == 1) {
- ret = ltdb_add_attr_results(module, msg, attrs, &(res->count), &(res->msgs));
+ ret = ltdb_add_attr_results(module, res, msg,
+ attrs, &(res->count), &(res->msgs));
}
talloc_free(msg);
if (ret != 0) {