r16036: Add a couple of new functions to corretly deal with timeouts.

Check timeouts are correctly verified.
Some minor fixed and removal of unused code.
(This used to be commit b52e5d6a0cb1a32e62759eaa49ce3e4cc804cc92)

1 files changed, 4 insertions, 2 deletions

diff --git a/source4/lib/ldb/modules/objectclass.c b/source4/lib/ldb/modules/objectclass.c
index 4423f82aed..6c50ba19c8 100644
--- a/source4/lib/ldb/modules/objectclass.c
+++ b/source4/lib/ldb/modules/objectclass.c
@@ -124,6 +124,7 @@ static int objectclass_add(struct ldb_module *module, struct ldb_request *req)
 
 	ac->down_req->async.context = NULL;
 	ac->down_req->async.callback = NULL;
+	ldb_set_timeout_from_prev_req(module->ldb, req, ac->down_req);
 
 	ac->step = OC_DO_REQ;
 
@@ -171,6 +172,7 @@ static int objectclass_modify(struct ldb_module *module, struct ldb_request *req
 
 	ac->down_req->async.context = NULL;
 	ac->down_req->async.callback = NULL;
+	ldb_set_timeout_from_prev_req(module->ldb, req, ac->down_req);
 
 	ac->step = OC_DO_REQ;
 
@@ -230,7 +232,7 @@ static int objectclass_search_self(struct ldb_async_handle *h) {
 	ac->search_req->controls = NULL;
 	ac->search_req->async.context = ac;
 	ac->search_req->async.callback = get_self_callback;
-	ac->search_req->async.timeout = ac->orig_req->async.timeout;
+	ldb_set_timeout_from_prev_req(ac->module->ldb, ac->orig_req, ac->search_req);
 
 	ac->step = OC_SEARCH_SELF;
 
@@ -270,7 +272,7 @@ static int objectclass_do_mod(struct ldb_async_handle *h) {
 	ac->mod_req->controls = NULL;
 	ac->mod_req->async.context = ac;
 	ac->mod_req->async.callback = NULL;
-	ac->mod_req->async.timeout = ac->orig_req->async.timeout;
+	ldb_set_timeout_from_prev_req(ac->module->ldb, ac->orig_req, ac->mod_req);
 	
 	/* use a new message structure */
 	ac->mod_req->op.mod.message = msg = ldb_msg_new(ac->mod_req);