summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-01-06 09:23:29 +1100
committerAndrew Tridgell <tridge@samba.org>2010-01-08 13:02:59 +1100
commit439ee5aaaeb9036d2db69d512bcbc7e88f4a601e (patch)
tree59b4f801ea48da2eab22b6c55f00a6747ef2a324 /source4
parentd0bd6e7ea5a6cc760916acd4f549ac7652c46e05 (diff)
downloadsamba-439ee5aaaeb9036d2db69d512bcbc7e88f4a601e.tar.gz
samba-439ee5aaaeb9036d2db69d512bcbc7e88f4a601e.tar.bz2
samba-439ee5aaaeb9036d2db69d512bcbc7e88f4a601e.zip
s4-dsdb: use dsdb_next_callback()
We can't just use the callers callback directly otherwise the ldb_module_done() is never called on the parent request, as the child request is passed to the callback. Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/samdb/ldb_modules/instancetype.c3
-rw-r--r--source4/dsdb/samdb/ldb_modules/lazy_commit.c13
-rw-r--r--source4/dsdb/samdb/ldb_modules/show_deleted.c4
3 files changed, 11 insertions, 9 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/instancetype.c b/source4/dsdb/samdb/ldb_modules/instancetype.c
index b17f40e82a..0a297d587a 100644
--- a/source4/dsdb/samdb/ldb_modules/instancetype.c
+++ b/source4/dsdb/samdb/ldb_modules/instancetype.c
@@ -36,6 +36,7 @@
#include "librpc/gen_ndr/ndr_misc.h"
#include "dsdb/samdb/samdb.h"
#include "../libds/common/flags.h"
+#include "dsdb/samdb/ldb_modules/util.h"
struct it_context {
struct ldb_module *module;
@@ -143,7 +144,7 @@ static int instancetype_add(struct ldb_module *module, struct ldb_request *req)
ret = ldb_build_add_req(&down_req, ldb, req,
msg,
req->controls,
- req->context, req->callback,
+ req, dsdb_next_callback,
req);
if (ret != LDB_SUCCESS) {
return ret;
diff --git a/source4/dsdb/samdb/ldb_modules/lazy_commit.c b/source4/dsdb/samdb/ldb_modules/lazy_commit.c
index 0502b2efa1..b4eaf50d51 100644
--- a/source4/dsdb/samdb/ldb_modules/lazy_commit.c
+++ b/source4/dsdb/samdb/ldb_modules/lazy_commit.c
@@ -28,6 +28,7 @@
*/
#include "ldb_module.h"
+#include "dsdb/samdb/ldb_modules/util.h"
static int unlazy_op(struct ldb_module *module, struct ldb_request *req)
{
@@ -47,28 +48,28 @@ static int unlazy_op(struct ldb_module *module, struct ldb_request *req)
req->op.search.tree,
req->op.search.attrs,
req->controls,
- req->context, req->callback,
+ req, dsdb_next_callback,
req);
break;
case LDB_ADD:
ret = ldb_build_add_req(&new_req, ldb_module_get_ctx(module), req,
req->op.add.message,
req->controls,
- req->context, req->callback,
+ req, dsdb_next_callback,
req);
break;
case LDB_MODIFY:
ret = ldb_build_mod_req(&new_req, ldb_module_get_ctx(module), req,
req->op.mod.message,
req->controls,
- req->context, req->callback,
+ req, dsdb_next_callback,
req);
break;
case LDB_DELETE:
ret = ldb_build_del_req(&new_req, ldb_module_get_ctx(module), req,
req->op.del.dn,
req->controls,
- req->context, req->callback,
+ req, dsdb_next_callback,
req);
break;
case LDB_RENAME:
@@ -76,7 +77,7 @@ static int unlazy_op(struct ldb_module *module, struct ldb_request *req)
req->op.rename.olddn,
req->op.rename.newdn,
req->controls,
- req->context, req->callback,
+ req, dsdb_next_callback,
req);
break;
case LDB_EXTENDED:
@@ -85,7 +86,7 @@ static int unlazy_op(struct ldb_module *module, struct ldb_request *req)
req->op.extended.oid,
req->op.extended.data,
req->controls,
- req->context, req->callback,
+ req, dsdb_next_callback,
req);
break;
default:
diff --git a/source4/dsdb/samdb/ldb_modules/show_deleted.c b/source4/dsdb/samdb/ldb_modules/show_deleted.c
index 666d28053c..93463ae95f 100644
--- a/source4/dsdb/samdb/ldb_modules/show_deleted.c
+++ b/source4/dsdb/samdb/ldb_modules/show_deleted.c
@@ -32,7 +32,7 @@
#include "includes.h"
#include "ldb/include/ldb_module.h"
#include "dsdb/samdb/samdb.h"
-
+#include "dsdb/samdb/ldb_modules/util.h"
static int show_deleted_search(struct ldb_module *module, struct ldb_request *req)
{
@@ -83,7 +83,7 @@ static int show_deleted_search(struct ldb_module *module, struct ldb_request *re
new_tree,
req->op.search.attrs,
req->controls,
- req->context, req->callback,
+ req, dsdb_next_callback,
req);
if (ret != LDB_SUCCESS) {
return ret;