r15761: Fix-as-you-go ...

Testing various async paths and uncovering bugs
(This used to be commit 099d873ea596ece18efe63b06bc64e7f97a96f82)

4 files changed, 35 insertions, 46 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index b7f4aff67a..617962b909 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -1672,11 +1672,11 @@ static int ph_async_wait(struct ldb_async_handle *handle) {
 
 	switch (ac->step) {
 	case PH_ADD_SEARCH_DOM:
-		if (ac->dom_req->async.handle->status != LDB_ASYNC_DONE) {
+		if (ac->dom_req->async.handle->state != LDB_ASYNC_DONE) {
 			ret = ldb_async_wait(ac->dom_req->async.handle, LDB_WAIT_NONE);
-			if (ret != LDB_SUCCESS) goto error;
+			if (ret != LDB_SUCCESS) goto done;
 
-			if (ac->dom_req->async.handle->status != LDB_ASYNC_DONE) {
+			if (ac->dom_req->async.handle->state != LDB_ASYNC_DONE) {
 				return LDB_SUCCESS;
 			}
 		}
@@ -1685,22 +1685,22 @@ static int ph_async_wait(struct ldb_async_handle *handle) {
 		return password_hash_add_async_do_add(handle);
 
 	case PH_ADD_DO_ADD:
-		if (ac->down_req->async.handle->status != LDB_ASYNC_DONE) {
+		if (ac->down_req->async.handle->state != LDB_ASYNC_DONE) {
 			ret = ldb_async_wait(ac->down_req->async.handle, LDB_WAIT_NONE);
-			if (ret != LDB_SUCCESS) goto error;
+			if (ret != LDB_SUCCESS) goto done;
 
-			if (ac->down_req->async.handle->status != LDB_ASYNC_DONE) {
+			if (ac->down_req->async.handle->state != LDB_ASYNC_DONE) {
 				return LDB_SUCCESS;
 			}
 		}
 		return LDB_SUCCESS;
 		
 	case PH_MOD_DO_REQ:
-		if (ac->down_req->async.handle->status != LDB_ASYNC_DONE) {
+		if (ac->down_req->async.handle->state != LDB_ASYNC_DONE) {
 			ret = ldb_async_wait(ac->down_req->async.handle, LDB_WAIT_NONE);
-			if (ret != LDB_SUCCESS) goto error;
+			if (ret != LDB_SUCCESS) goto done;
 
-			if (ac->down_req->async.handle->status != LDB_ASYNC_DONE) {
+			if (ac->down_req->async.handle->state != LDB_ASYNC_DONE) {
 				return LDB_SUCCESS;
 			}
 		}
@@ -1709,11 +1709,11 @@ static int ph_async_wait(struct ldb_async_handle *handle) {
 		return password_hash_mod_async_search_self(handle);
 		
 	case PH_MOD_SEARCH_SELF:
-		if (ac->search_req->async.handle->status != LDB_ASYNC_DONE) {
+		if (ac->search_req->async.handle->state != LDB_ASYNC_DONE) {
 			ret = ldb_async_wait(ac->search_req->async.handle, LDB_WAIT_NONE);
-			if (ret != LDB_SUCCESS) goto error;
+			if (ret != LDB_SUCCESS) goto done;
 
-			if (ac->search_req->async.handle->status != LDB_ASYNC_DONE) {
+			if (ac->search_req->async.handle->state != LDB_ASYNC_DONE) {
 				return LDB_SUCCESS;
 			}
 		}
@@ -1722,11 +1722,11 @@ static int ph_async_wait(struct ldb_async_handle *handle) {
 		return password_hash_mod_async_search_dom(handle);
 		
 	case PH_MOD_SEARCH_DOM:
-		if (ac->dom_req->async.handle->status != LDB_ASYNC_DONE) {
+		if (ac->dom_req->async.handle->state != LDB_ASYNC_DONE) {
 			ret = ldb_async_wait(ac->dom_req->async.handle, LDB_WAIT_NONE);
-			if (ret != LDB_SUCCESS) goto error;
+			if (ret != LDB_SUCCESS) goto done;
 
-			if (ac->dom_req->async.handle->status != LDB_ASYNC_DONE) {
+			if (ac->dom_req->async.handle->state != LDB_ASYNC_DONE) {
 				return LDB_SUCCESS;
 			}
 		}
@@ -1735,22 +1735,25 @@ static int ph_async_wait(struct ldb_async_handle *handle) {
 		return password_hash_mod_async_do_mod(handle);
 
 	case PH_MOD_DO_MOD:
-		if (ac->mod_req->async.handle->status != LDB_ASYNC_DONE) {
+		if (ac->mod_req->async.handle->state != LDB_ASYNC_DONE) {
 			ret = ldb_async_wait(ac->mod_req->async.handle, LDB_WAIT_NONE);
-			if (ret != LDB_SUCCESS) goto error;
+			if (ret != LDB_SUCCESS) goto done;
 
-			if (ac->mod_req->async.handle->status != LDB_ASYNC_DONE) {
+			if (ac->mod_req->async.handle->state != LDB_ASYNC_DONE) {
 				return LDB_SUCCESS;
 			}
 		}
-		return LDB_SUCCESS;
+
+		break;
 		
 	default:
 		ret = LDB_ERR_OPERATIONS_ERROR;
-		goto error;
+		goto done;
 	}
 
-error:
+	ret = LDB_SUCCESS;
+
+done:
 	handle->state = LDB_ASYNC_DONE;
 	handle->status = ret;
 	return ret;
diff --git a/source4/lib/ldb/common/ldb_msg.c b/source4/lib/ldb/common/ldb_msg.c
index b09f2ce6ed..bae17e7046 100644
--- a/source4/lib/ldb/common/ldb_msg.c
+++ b/source4/lib/ldb/common/ldb_msg.c
@@ -734,7 +734,7 @@ int ldb_msg_check_string_attribute(const struct ldb_message *msg, const char *na
 		return 0;
 
 	val.data = discard_const(value);
-	val.length = strlen(value) + 1;
+	val.length = strlen(value);
 
 	if (ldb_msg_find_val(el, &val))
 		return 1;
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 866b062d06..9f0613feaa 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -619,17 +619,17 @@ struct ldb_async_handle {
 struct ldb_search {
 	const struct ldb_dn *base;
 	enum ldb_scope scope;
-	struct ldb_parse_tree *tree;
+	const struct ldb_parse_tree *tree;
 	const char * const *attrs;
 	struct ldb_result *res;
 };
 
 struct ldb_add {
-	struct ldb_message *message;
+	const struct ldb_message *message;
 };
 
 struct  ldb_modify {
-	struct ldb_message *message;
+	const struct ldb_message *message;
 };
 
 struct ldb_delete {
@@ -647,7 +647,7 @@ struct ldb_register_control {
 
 struct ldb_request {
 
-	int operation;
+	enum ldb_request_type operation;
 
 	union {
 		struct ldb_search search;
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);