r15913: Error passing in the async code is not in agood shape

Start enhancing it and fix some problems with incorrect evalutaion of the codes

Implement rdn rename (async only)
(This used to be commit 6af1d738b9668d4f0eb6194ac0f84af9e73f8c2e)

2 files changed, 80 insertions, 87 deletions

diff --git a/source4/lib/ldb/ldb_tdb/ldb_search.c b/source4/lib/ldb/ldb_tdb/ldb_search.c
index 7e14a3000a..0ab1442c2f 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_search.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_search.c
@@ -462,15 +462,12 @@ static int ltdb_search_full(struct ldb_async_handle *handle)
 
 	ret = tdb_traverse_read(ltdb->tdb, search_func, handle);
 
-	handle->state = LDB_ASYNC_DONE;
-
 	if (ret == -1) {
 		handle->status = LDB_ERR_OPERATIONS_ERROR;
-		return handle->status;
 	}
 
-	handle->status = LDB_SUCCESS;
-	return handle->status;
+	handle->state = LDB_ASYNC_DONE;
+	return LDB_SUCCESS;
 }
 
 static int ltdb_search_sync_callback(struct ldb_context *ldb, void *context, struct ldb_async_result *ares)
@@ -548,7 +545,6 @@ int ltdb_search_async(struct ldb_module *module, const struct ldb_dn *base,
 
 	*handle = init_ltdb_handle(ltdb, module, context, callback);
 	if (*handle == NULL) {
-		talloc_free(*handle);
 		ltdb_unlock_read(module);
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
@@ -566,13 +562,13 @@ int ltdb_search_async(struct ldb_module *module, const struct ldb_dn *base,
 	}
 	if (ret != LDB_SUCCESS) {
 		ldb_set_errstring(module->ldb, talloc_strdup(module->ldb, "Indexed and full searches both failed!\n"));
-		talloc_free(*handle);
-		*handle = NULL;
+		(*handle)->state = LDB_ASYNC_DONE;
+		(*handle)->status = ret;
 	}
 
 	ltdb_unlock_read(module);
 
-	return ret;
+	return LDB_SUCCESS;
 }
 
 /*
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
index 3a1a08aafd..e0465afb30 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -266,40 +266,41 @@ static int ltdb_add_async(struct ldb_module *module, const struct ldb_message *m
 {
 	struct ltdb_private *ltdb = talloc_get_type(module->private_data, struct ltdb_private);
 	struct ltdb_async_context *ltdb_ac;
-	int ret = LDB_ERR_OPERATIONS_ERROR;
+	int tret, ret = LDB_SUCCESS;
 
 	*handle = init_ltdb_handle(ltdb, module, context, callback);
 	if (*handle == NULL) {
-		return ret;
+		return LDB_ERR_OPERATIONS_ERROR;
 	}
 	ltdb_ac = talloc_get_type((*handle)->private_data, struct ltdb_async_context);
-	(*handle)->state = LDB_ASYNC_DONE;
-	(*handle)->status = LDB_SUCCESS;
 
-	ret = ltdb_check_special_dn(module, msg);
-	if (ret != LDB_SUCCESS) {
-		talloc_free(*handle);
-		return ret;
+	tret = ltdb_check_special_dn(module, msg);
+	if (tret != LDB_SUCCESS) {
+		(*handle)->status = tret;
+		goto done;
 	}
 	
 	if (ltdb_cache_load(module) != 0) {
-		talloc_free(*handle);
-		return LDB_ERR_OTHER;
+		ret = LDB_ERR_OTHER;
+		goto done;
 	}
 
-	ret = ltdb_store(module, msg, TDB_INSERT);
+	tret = ltdb_store(module, msg, TDB_INSERT);
 
-	if (ret != LDB_SUCCESS) {
-		(*handle)->status = ret;
-		return LDB_SUCCESS;
+	if (tret != LDB_SUCCESS) {
+		(*handle)->status = tret;
+		goto done;
 	}
 
 	ltdb_modified(module, msg->dn);
 
-	if (ltdb_ac->callback)
-		(*handle)->status = ltdb_ac->callback(module->ldb, ltdb_ac->context, NULL);
-	
-	return LDB_SUCCESS;
+	if (ltdb_ac->callback) {
+		ret = ltdb_ac->callback(module->ldb, ltdb_ac->context, NULL);
+	}
+
+done:
+	(*handle)->state = LDB_ASYNC_DONE;
+	return ret;
 }
 
 static int ltdb_add(struct ldb_module *module, const struct ldb_message *msg)
@@ -354,55 +355,54 @@ static int ltdb_delete_async(struct ldb_module *module, const struct ldb_dn *dn,
 	struct ltdb_private *ltdb = talloc_get_type(module->private_data, struct ltdb_private);
 	struct ltdb_async_context *ltdb_ac;
 	struct ldb_message *msg;
-	int ret = LDB_ERR_OPERATIONS_ERROR;
+	int tret, ret = LDB_SUCCESS;
 
 	*handle = NULL;
 
 	if (ltdb_cache_load(module) != 0) {
-		goto failed;
+		return LDB_ERR_OPERATIONS_ERROR;
 	}
 
 	*handle = init_ltdb_handle(ltdb, module, context, callback);
 	if (*handle == NULL) {
-		goto failed;
+		return LDB_ERR_OPERATIONS_ERROR;
 	}
 	ltdb_ac = talloc_get_type((*handle)->private_data, struct ltdb_async_context);
-	(*handle)->state = LDB_ASYNC_DONE;
-	(*handle)->status = LDB_SUCCESS;
 
 	msg = talloc(ltdb_ac, struct ldb_message);
 	if (msg == NULL) {
-		goto failed;
+		ret = LDB_ERR_OPERATIONS_ERROR;
+		goto done;
 	}
 
 	/* in case any attribute of the message was indexed, we need
 	   to fetch the old record */
-	ret = ltdb_search_dn1(module, dn, msg);
-	if (ret != 1) {
+	tret = ltdb_search_dn1(module, dn, msg);
+	if (tret != 1) {
 		/* not finding the old record is an error */
 		(*handle)->status = LDB_ERR_NO_SUCH_OBJECT;
-		return LDB_SUCCESS;
+		goto done;
 	}
 
-	ret = ltdb_delete_noindex(module, dn);
-	if (ret != LDB_SUCCESS) {
-		goto failed;
+	tret = ltdb_delete_noindex(module, dn);
+	if (tret != LDB_SUCCESS) {
+		(*handle)->status = LDB_ERR_NO_SUCH_OBJECT;
+		goto done;
 	}
 
 	/* remove any indexed attributes */
-	ret = ltdb_index_del(module, msg);
-	if (ret) {
-		goto failed;
+	tret = ltdb_index_del(module, msg);
+	if (tret != LDB_SUCCESS) {
+		(*handle)->status = LDB_ERR_NO_SUCH_OBJECT;
+		goto done;
 	}
 	ltdb_modified(module, dn);
 
 	if (ltdb_ac->callback)
-		(*handle)->status = ltdb_ac->callback(module->ldb, ltdb_ac->context, NULL);
-	
-	return LDB_SUCCESS;
+		ret = ltdb_ac->callback(module->ldb, ltdb_ac->context, NULL);
 
-failed:
-	talloc_free(*handle);
+done:
+	(*handle)->state = LDB_ASYNC_DONE;
 	return ret;
 }
 
@@ -741,42 +741,42 @@ static int ltdb_modify_async(struct ldb_module *module, const struct ldb_message
 {
 	struct ltdb_private *ltdb = talloc_get_type(module->private_data, struct ltdb_private);
 	struct ltdb_async_context *ltdb_ac;
-	int ret = LDB_ERR_OPERATIONS_ERROR;
+	int tret, ret = LDB_SUCCESS;
 
 	*handle = NULL;
 
 	*handle = init_ltdb_handle(ltdb, module, context, callback);
 	if (*handle == NULL) {
-		return ret;
+		return LDB_ERR_OPERATIONS_ERROR;
 	}
 	ltdb_ac = talloc_get_type((*handle)->private_data, struct ltdb_async_context);
-	(*handle)->state = LDB_ASYNC_DONE;
-	(*handle)->status = LDB_SUCCESS;
 
-	ret = ltdb_check_special_dn(module, msg);
-	if (ret != LDB_SUCCESS) {
-		talloc_free(*handle);
-		return ret;
+	tret = ltdb_check_special_dn(module, msg);
+	if (tret != LDB_SUCCESS) {
+		(*handle)->status = tret;
+		goto done;
 	}
 	
 	if (ltdb_cache_load(module) != 0) {
-		talloc_free(*handle);
-		return LDB_ERR_OTHER;
+		ret = LDB_ERR_OPERATIONS_ERROR;
+		goto done;
 	}
 
-	ret = ltdb_modify_internal(module, msg);
+	tret = ltdb_modify_internal(module, msg);
 
-	if (ret != LDB_SUCCESS) {
-		(*handle)->status = ret;
-		return LDB_SUCCESS;
+	if (tret != LDB_SUCCESS) {
+		(*handle)->status = tret;
+		goto done;
 	}
 
 	ltdb_modified(module, msg->dn);
 
 	if (ltdb_ac->callback)
-		(*handle)->status = ltdb_ac->callback(module->ldb, ltdb_ac->context, NULL);
-	
-	return LDB_SUCCESS;
+		ret = ltdb_ac->callback(module->ldb, ltdb_ac->context, NULL);
+
+done:
+	(*handle)->state = LDB_ASYNC_DONE;
+	return ret;
 }
 
 static int ltdb_modify(struct ldb_module *module, const struct ldb_message *msg)
@@ -806,62 +806,59 @@ static int ltdb_rename_async(struct ldb_module *module, const struct ldb_dn *old
 	struct ltdb_private *ltdb = talloc_get_type(module->private_data, struct ltdb_private);
 	struct ltdb_async_context *ltdb_ac;
 	struct ldb_message *msg;
-	int ret = LDB_ERR_OPERATIONS_ERROR;
+	int tret, ret = LDB_SUCCESS;
 
 	*handle = NULL;
 
 	if (ltdb_cache_load(module) != 0) {
-		return ret;
+		return LDB_ERR_OPERATIONS_ERROR;
 	}
 
 	*handle = init_ltdb_handle(ltdb, module, context, callback);
 	if (*handle == NULL) {
-		goto failed;
+		return LDB_ERR_OPERATIONS_ERROR;
 	}
 	ltdb_ac = talloc_get_type((*handle)->private_data, struct ltdb_async_context);
-	(*handle)->state = LDB_ASYNC_DONE;
-	(*handle)->status = LDB_SUCCESS;
 
 	msg = talloc(ltdb_ac, struct ldb_message);
 	if (msg == NULL) {
-		goto failed;
+		ret = LDB_ERR_OPERATIONS_ERROR;
+		goto done;
 	}
 
 	/* in case any attribute of the message was indexed, we need
 	   to fetch the old record */
-	ret = ltdb_search_dn1(module, olddn, msg);
-	if (ret != 1) {
+	tret = ltdb_search_dn1(module, olddn, msg);
+	if (tret != 1) {
 		/* not finding the old record is an error */
 		(*handle)->status = LDB_ERR_NO_SUCH_OBJECT;
-		return LDB_SUCCESS;
+		goto done;
 	}
 
 	msg->dn = ldb_dn_copy(msg, newdn);
 	if (!msg->dn) {
 		ret = LDB_ERR_OPERATIONS_ERROR;
-		goto failed;
+		goto done;
 	}
 
-	ret = ltdb_add(module, msg);
-	if (ret != LDB_SUCCESS) {
-		(*handle)->status = LDB_ERR_OPERATIONS_ERROR;
-		return LDB_SUCCESS;
+	tret = ltdb_add(module, msg);
+	if (tret != LDB_SUCCESS) {
+		ret = LDB_ERR_OPERATIONS_ERROR;
+		goto done;
 	}
 
-	ret = ltdb_delete(module, olddn);
-	if (ret != LDB_SUCCESS) {
+	tret = ltdb_delete(module, olddn);
+	if (tret != LDB_SUCCESS) {
 		ltdb_delete(module, newdn);
-		(*handle)->status = ret;
-		return LDB_SUCCESS;
+		ret = LDB_ERR_OPERATIONS_ERROR;
+		goto done;
 	}
 
 	if (ltdb_ac->callback)
-		(*handle)->status = ltdb_ac->callback(module->ldb, ltdb_ac->context, NULL);
+		ret = ltdb_ac->callback(module->ldb, ltdb_ac->context, NULL);
 
-	return LDB_SUCCESS;
-
-failed:
-	talloc_free(*handle);
+done:
+	(*handle)->state = LDB_ASYNC_DONE;
 	return ret;
 }