diff options
author | Simo Sorce <idra@samba.org> | 2006-05-21 20:06:01 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:08:19 -0500 |
commit | e2112ba3b7d491f6b6d9957b57a36a78efed18a9 (patch) | |
tree | 0c1d731eaae11579a71a635dd7d78043b435face /source4/dsdb/samdb/ldb_modules/objectguid.c | |
parent | 03f520fd1232ef14eeb75af439685c6978db04e3 (diff) | |
download | samba-e2112ba3b7d491f6b6d9957b57a36a78efed18a9.tar.gz samba-e2112ba3b7d491f6b6d9957b57a36a78efed18a9.tar.bz2 samba-e2112ba3b7d491f6b6d9957b57a36a78efed18a9.zip |
r15782: More fixes for async cases
(This used to be commit 3c9434e264710a1fa29adedbe571d5324ecae906)
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/objectguid.c')
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/objectguid.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/objectguid.c b/source4/dsdb/samdb/ldb_modules/objectguid.c index 71591f187f..96457447fb 100644 --- a/source4/dsdb/samdb/ldb_modules/objectguid.c +++ b/source4/dsdb/samdb/ldb_modules/objectguid.c @@ -133,8 +133,10 @@ static int objectguid_add_async(struct ldb_module *module, struct ldb_request *r 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.add.message = msg = ldb_msg_copy_shallow(down_req, req->op.add.message); if (msg == NULL) { return LDB_ERR_OPERATIONS_ERROR; } @@ -152,16 +154,7 @@ static int objectguid_add_async(struct ldb_module *module, struct ldb_request *r if (ret) { return ret; } - - 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); |