summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2006-05-21 21:24:11 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:08:20 -0500
commitbc12d3bccc5617943ea866202f0507d11bebcd81 (patch)
tree0b9d3084f1a127de4cd63a3f59b0b717dc117d40
parent669df64c34fd5e6e089efa10ffe6bf078dfec745 (diff)
downloadsamba-bc12d3bccc5617943ea866202f0507d11bebcd81.tar.gz
samba-bc12d3bccc5617943ea866202f0507d11bebcd81.tar.bz2
samba-bc12d3bccc5617943ea866202f0507d11bebcd81.zip
r15786: another fix in rdn_name
(This used to be commit 202ce2a947626f51467d5c87dfcdb73852282709)
-rw-r--r--source4/lib/ldb/modules/rdn_name.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c
index 4f0b11cd51..18ad625ee2 100644
--- a/source4/lib/ldb/modules/rdn_name.c
+++ b/source4/lib/ldb/modules/rdn_name.c
@@ -152,7 +152,9 @@ static int rdn_name_add_async(struct ldb_module *module, struct ldb_request *req
return LDB_ERR_OPERATIONS_ERROR;
}
- msg = ldb_msg_copy_shallow(down_req, req->op.add.message);
+ *down_req = *req;
+
+ down_req->op.add.message = msg = ldb_msg_copy_shallow(down_req, req->op.add.message);
if (msg == NULL) {
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -199,15 +201,6 @@ static int rdn_name_add_async(struct ldb_module *module, struct ldb_request *req
}
}
- 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);