diff options
| author | Simo Sorce <idra@samba.org> | 2006-05-20 19:37:21 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:08:15 -0500 |
| commit | 6d0969aa1adff4c7f134bd6e3e42997e72b41cf6 (patch) | |
| tree | 67b86f66eb8f698988c3484c55774e3b1397ced5 /source4/lib/ldb/modules/operational.c | |
| parent | e23cc70a72e6582e91bcfdaf1d6ed2191e7e23a6 (diff) | |
| download | samba-6d0969aa1adff4c7f134bd6e3e42997e72b41cf6.tar.gz samba-6d0969aa1adff4c7f134bd6e3e42997e72b41cf6.tar.bz2 samba-6d0969aa1adff4c7f134bd6e3e42997e72b41cf6.zip | |
r15761: Fix-as-you-go ...
Testing various async paths and uncovering bugs
(This used to be commit 099d873ea596ece18efe63b06bc64e7f97a96f82)
Diffstat (limited to 'source4/lib/ldb/modules/operational.c')
| -rw-r--r-- | source4/lib/ldb/modules/operational.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/source4/lib/ldb/modules/operational.c b/source4/lib/ldb/modules/operational.c index 070f91e762..d796e93e54 100644 --- a/source4/lib/ldb/modules/operational.c +++ b/source4/lib/ldb/modules/operational.c @@ -522,8 +522,10 @@ static int operational_add_async(struct ldb_module *module, struct ldb_request * return LDB_ERR_OPERATIONS_ERROR; } + *down_req = *req; + /* we have to copy the message as the caller might have it as a const */ - msg = ldb_msg_copy_shallow(down_req, req->op.add.message); + down_req->op.mod.message = msg = ldb_msg_copy_shallow(down_req, req->op.mod.message); if (msg == NULL) { return LDB_ERR_OPERATIONS_ERROR; } @@ -543,15 +545,6 @@ static int operational_add_async(struct ldb_module *module, struct ldb_request * } } - down_req->op.add.message = msg; - - down_req->controls = req->controls; - down_req->creds = req->creds; - - down_req->async.context = req->async.context; - down_req->async.callback = req->async.callback; - down_req->async.timeout = req->async.timeout; - /* go on with the call chain */ ret = ldb_next_request(module, down_req); @@ -583,8 +576,10 @@ static int operational_modify_async(struct ldb_module *module, struct ldb_reques return LDB_ERR_OPERATIONS_ERROR; } + *down_req = *req; + /* we have to copy the message as the caller might have it as a const */ - msg = ldb_msg_copy_shallow(down_req, req->op.mod.message); + down_req->op.mod.message = msg = ldb_msg_copy_shallow(down_req, req->op.mod.message); if (msg == NULL) { return LDB_ERR_OPERATIONS_ERROR; } @@ -600,16 +595,7 @@ static int operational_modify_async(struct ldb_module *module, struct ldb_reques talloc_free(down_req); return -1; } - - down_req->op.mod.message = msg; - down_req->controls = req->controls; - down_req->creds = req->creds; - - down_req->async.context = req->async.context; - down_req->async.callback = req->async.callback; - down_req->async.timeout = req->async.timeout; - /* go on with the call chain */ ret = ldb_next_request(module, down_req); |