summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/modules
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2006-02-22 05:21:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:59 -0500
commitd590dea10b3abf93fcc8138189291e8b66bae7d7 (patch)
treed859a38ca49d480c36e3a8a3ef2ac28e2b964066 /source4/lib/ldb/modules
parent00fe70e5b917769418f68eaa255d3a06a9a08ce7 (diff)
downloadsamba-d590dea10b3abf93fcc8138189291e8b66bae7d7.tar.gz
samba-d590dea10b3abf93fcc8138189291e8b66bae7d7.tar.bz2
samba-d590dea10b3abf93fcc8138189291e8b66bae7d7.zip
r13615: Make ldb_set_errstring get ldb instead of module as parameter.
The module was just used to get to the ldb so it was meningless. Also add LDB_WAIT_ONCE e relative code in ldb_ildap.c (This used to be commit d5b467b7c132b0bd4d23918ba7bf3370b1afcce8)
Diffstat (limited to 'source4/lib/ldb/modules')
-rw-r--r--source4/lib/ldb/modules/ldb_map.c2
-rw-r--r--source4/lib/ldb/modules/objectclass.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/ldb/modules/ldb_map.c b/source4/lib/ldb/modules/ldb_map.c
index 4c2ef5b239..f313a6e564 100644
--- a/source4/lib/ldb/modules/ldb_map.c
+++ b/source4/lib/ldb/modules/ldb_map.c
@@ -827,7 +827,7 @@ static int map_search_mp(struct ldb_module *module, struct ldb_request *req)
talloc_free(newattrs);
if (mpret != LDB_SUCCESS) {
- ldb_set_errstring(module, talloc_strdup(module, ldb_errstring(privdat->mapped_ldb)));
+ ldb_set_errstring(module->ldb, talloc_strdup(module, ldb_errstring(privdat->mapped_ldb)));
return mpret;
}
diff --git a/source4/lib/ldb/modules/objectclass.c b/source4/lib/ldb/modules/objectclass.c
index 479d943a91..8b4ad598cc 100644
--- a/source4/lib/ldb/modules/objectclass.c
+++ b/source4/lib/ldb/modules/objectclass.c
@@ -115,7 +115,7 @@ static int objectclass_handle(struct ldb_module *module, struct ldb_request *req
res = search_request->op.search.res;
talloc_steal(mem_ctx, res);
if (res->count != 1) {
- ldb_set_errstring(module,
+ ldb_set_errstring(module->ldb,
talloc_asprintf(mem_ctx, "objectClass_handle: "
"search for %s found %d != 1 objects, for entry we just added/modified",
ldb_dn_linearize(mem_ctx, msg->dn),