summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-05-06 04:45:29 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:51:45 -0500
commit9261ceb89e3394da3d41197354a7da723678187e (patch)
tree6ffb88478d67160115d4cb4924749d839a329627 /source4/lib
parent722e301591dd0d603c12befc9e6462230f62f2b6 (diff)
downloadsamba-9261ceb89e3394da3d41197354a7da723678187e.tar.gz
samba-9261ceb89e3394da3d41197354a7da723678187e.tar.bz2
samba-9261ceb89e3394da3d41197354a7da723678187e.zip
r504: fixed a bad call to list_union()
(This used to be commit 4404056cd5fd65d72a38ea474fe330281b3ee19e)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/ldb/ldb_tdb/ldb_index.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/source4/lib/ldb/ldb_tdb/ldb_index.c
index 07077281ce..877955a9b7 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_index.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_index.c
@@ -188,7 +188,8 @@ static int ltdb_index_dn_objectclass(struct ldb_context *ldb,
int i;
int ret;
const char *target = tree->u.simple.value.data;
- static int list_union(struct dn_list *, const struct dn_list *);
+ static int list_union(struct ldb_context *,
+ struct dn_list *, const struct dn_list *);
list->count = 0;
list->dn = NULL;
@@ -214,7 +215,7 @@ static int ltdb_index_dn_objectclass(struct ldb_context *ldb,
*list = list2;
ret = 1;
} else {
- list_union(list, &list2);
+ list_union(ldb, list, &list2);
dn_list_free(ldb, &list2);
}
}