Merge branch 'master' of ssh://git.samba.org/data/git/samba into arc4

1 files changed, 152 insertions, 180 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/subtree_rename.c b/source4/dsdb/samdb/ldb_modules/subtree_rename.c
index fd1388d416..d3ceb8ad97 100644
--- a/source4/dsdb/samdb/ldb_modules/subtree_rename.c
+++ b/source4/dsdb/samdb/ldb_modules/subtree_rename.c
@@ -30,137 +30,182 @@
 
 #include "ldb_includes.h"
 
+struct subren_msg_store {
+	struct subren_msg_store *next;
+	struct ldb_dn *olddn;
+	struct ldb_dn *newdn;
+};
+
 struct subtree_rename_context {
 	struct ldb_module *module;
-	struct ldb_handle *handle;
-	struct ldb_request *orig_req;
-
-	struct ldb_request **down_req;
-	int num_requests;
-	int finished_requests;
+	struct ldb_request *req;
 
-	int num_children;
+	struct subren_msg_store *list;
+	struct subren_msg_store *current;
 };
 
-static struct subtree_rename_context *subtree_rename_init_handle(struct ldb_request *req, 
-								 struct ldb_module *module)
+static struct subtree_rename_context *subren_ctx_init(struct ldb_module *module,
+					 struct ldb_request *req)
 {
 	struct subtree_rename_context *ac;
-	struct ldb_handle *h;
 
-	h = talloc_zero(req, struct ldb_handle);
-	if (h == NULL) {
-		ldb_set_errstring(module->ldb, "Out of Memory");
+	ac = talloc_zero(req, struct subtree_rename_context);
+	if (ac == NULL) {
+		ldb_oom(module->ldb);
 		return NULL;
 	}
 
-	h->module = module;
+	ac->module = module;
+	ac->req = req;
 
-	ac = talloc_zero(h, struct subtree_rename_context);
-	if (ac == NULL) {
-		ldb_set_errstring(module->ldb, "Out of Memory");
-		talloc_free(h);
-		return NULL;
+	return ac;
+}
+
+static int subtree_rename_next_request(struct subtree_rename_context *ac);
+
+static int subtree_rename_callback(struct ldb_request *req,
+				   struct ldb_reply *ares)
+{
+	struct subtree_rename_context *ac;
+	int ret;
+
+	ac = talloc_get_type(req->context, struct subtree_rename_context);
+
+	if (!ares) {
+		return ldb_module_done(ac->req, NULL, NULL,
+					LDB_ERR_OPERATIONS_ERROR);
 	}
 
-	h->private_data	= ac;
+	if (ares->error != LDB_SUCCESS) {
+		return ldb_module_done(ac->req, ares->controls,
+					ares->response, ares->error);
+	}
 
-	ac->module = module;
-	ac->handle = h;
-	ac->orig_req = req;
+	if (ares->type != LDB_REPLY_DONE) {
+		ldb_set_errstring(ac->module->ldb, "Invalid reply type!\n");
+		return ldb_module_done(ac->req, NULL, NULL,
+					LDB_ERR_OPERATIONS_ERROR);
+	}
 
-	req->handle = h;
+	if (ac->current == NULL) {
+		/* this was the last one */
+		return ldb_module_done(ac->req, ares->controls,
+					ares->response, LDB_SUCCESS);
+	}
 
-	return ac;
-}
+	ret = subtree_rename_next_request(ac);
+	if (ret != LDB_SUCCESS) {
+		return ldb_module_done(ac->req, NULL, NULL, ret);
+	}
 
+	talloc_free(ares);
+	return LDB_SUCCESS;
+}
 
-static int subtree_rename_search_callback(struct ldb_context *ldb, void *context, struct ldb_reply *ares) 
+static int subtree_rename_next_request(struct subtree_rename_context *ac)
 {
 	struct ldb_request *req;
-	struct subtree_rename_context *ac = talloc_get_type(context, struct subtree_rename_context);
-	TALLOC_CTX *mem_ctx = talloc_new(ac);
-    
-	if (!mem_ctx) {
-		ldb_oom(ac->module->ldb);
+	int ret;
+
+	if (ac->current == NULL) {
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
-	/* OK, we have one of *many* search results here:
-
-	   We should also get the entry we tried to rename.  This
-	   callback handles this and everything below it.
-	 */
-
-	/* Only entries are interesting, and we handle the case of the parent seperatly */
-	if (ares->type == LDB_REPLY_ENTRY
-	    && ldb_dn_compare(ares->message->dn, ac->orig_req->op.rename.olddn) != 0) {
-		/* And it is an actual entry: now create a rename from it */
-		int ret;
-
-		struct ldb_dn *newdn = ldb_dn_copy(mem_ctx, ares->message->dn);
-		if (!newdn) {
-			ldb_oom(ac->module->ldb);
-			return LDB_ERR_OPERATIONS_ERROR;
+
+	ret = ldb_build_rename_req(&req, ac->module->ldb, ac->current,
+				   ac->current->olddn,
+				   ac->current->newdn,
+				   ac->req->controls,
+				   ac, subtree_rename_callback,
+				   ac->req);
+	if (ret != LDB_SUCCESS) {
+		return ret;
+	}
+
+	ac->current = ac->current->next;
+
+	return ldb_next_request(ac->module, req);
+}
+
+static int subtree_rename_search_callback(struct ldb_request *req,
+					  struct ldb_reply *ares)
+{
+	struct subren_msg_store *store;
+	struct subtree_rename_context *ac;
+	int ret;
+
+	ac = talloc_get_type(req->context, struct subtree_rename_context);
+
+	if (!ares || !ac->current) {
+		return ldb_module_done(ac->req, NULL, NULL,
+					LDB_ERR_OPERATIONS_ERROR);
+	}
+	if (ares->error != LDB_SUCCESS) {
+		return ldb_module_done(ac->req, ares->controls,
+					ares->response, ares->error);
+	}
+
+	switch (ares->type) {
+	case LDB_REPLY_ENTRY:
+
+		if (ldb_dn_compare(ares->message->dn, ac->list->olddn) == 0) {
+			/* this was already stored by the
+			 * subtree_rename_search() */
+			talloc_free(ares);
+			return LDB_SUCCESS;
 		}
-			
-		ldb_dn_remove_base_components(newdn, ldb_dn_get_comp_num(ac->orig_req->op.rename.olddn));
 
-		if (!ldb_dn_add_base(newdn, ac->orig_req->op.rename.newdn)) {
-			ldb_oom(ac->module->ldb);
-			return LDB_ERR_OPERATIONS_ERROR;
+		store = talloc_zero(ac, struct subren_msg_store);
+		if (store == NULL) {
+			return ldb_module_done(ac->req, NULL, NULL,
+						LDB_ERR_OPERATIONS_ERROR);
 		}
+		ac->current->next = store;
+		ac->current = store;
 
-		ret = ldb_build_rename_req(&req, ldb, mem_ctx,
-					   ares->message->dn,
-					   newdn,
-					   NULL,
-					   NULL,
-					   NULL);
-		
-		if (ret != LDB_SUCCESS) {
-			return ret;
+		/* the first list element contains the base for the rename */
+		store->olddn = talloc_steal(store, ares->message->dn);
+		store->newdn = ldb_dn_copy(store, store->olddn);
+
+		if ( ! ldb_dn_remove_base_components(store->newdn,
+				ldb_dn_get_comp_num(ac->list->olddn))) {
+			return ldb_module_done(ac->req, NULL, NULL,
+						LDB_ERR_OPERATIONS_ERROR);
 		}
 
-		ret = ldb_set_timeout_from_prev_req(ldb, ac->orig_req, req);
-		
-		if (ret != LDB_SUCCESS) {
-			return ret;
+		if ( ! ldb_dn_add_base(store->newdn, ac->list->newdn)) {
+			return ldb_module_done(ac->req, NULL, NULL,
+						LDB_ERR_OPERATIONS_ERROR);
 		}
 
-		talloc_steal(req, newdn);
+		break;
 
-		talloc_steal(req, ares->message->dn);
-		
-		talloc_free(ares);
-		
-	} else if (ares->type == LDB_REPLY_DONE) {
-		req = talloc(mem_ctx, struct ldb_request);
-		*req = *ac->orig_req;
-		talloc_free(ares);
+	case LDB_REPLY_REFERRAL:
+		/* ignore */
+		break;
 
-	} else {
-		talloc_free(ares);
-		return LDB_SUCCESS;
-	}
-	
-	ac->down_req = talloc_realloc(ac, ac->down_req, 
-				      struct ldb_request *, ac->num_requests + 1);
-	if (!ac->down_req) {
-		ldb_oom(ac->module->ldb);
-		return LDB_ERR_OPERATIONS_ERROR;
+	case LDB_REPLY_DONE:
+
+		/* rewind ac->current */
+		ac->current = ac->list;
+
+		/* All dns set up, start with the first one */
+		ret = subtree_rename_next_request(ac);
+
+		if (ret != LDB_SUCCESS) {
+			return ldb_module_done(ac->req, NULL, NULL, ret);
+		}
+		break;
 	}
-	ac->down_req[ac->num_requests] = req;
-	ac->num_requests++;
-	
-	return ldb_next_request(ac->module, req);
-	
+
+	talloc_free(ares);
+	return LDB_SUCCESS;
 }
 
 /* rename */
 static int subtree_rename(struct ldb_module *module, struct ldb_request *req)
 {
-	const char *attrs[] = { NULL };
-	struct ldb_request *new_req;
+	static const char *attrs[2] = { "distinguishedName", NULL };
+	struct ldb_request *search_req;
 	struct subtree_rename_context *ac;
 	int ret;
 	if (ldb_dn_is_special(req->op.rename.olddn)) { /* do not manipulate our control entries */
@@ -176,110 +221,37 @@ static int subtree_rename(struct ldb_module *module, struct ldb_request *req)
 	   - Regain our sainity 
 	*/
 
-	ac = subtree_rename_init_handle(req, module);
+	ac = subren_ctx_init(module, req);
 	if (!ac) {
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
 
-	ret = ldb_build_search_req(&new_req, module->ldb, req,
+	/* add this entry as the first to do */
+	ac->current = talloc_zero(ac, struct subren_msg_store);
+	if (ac->current == NULL) {
+		return LDB_ERR_OPERATIONS_ERROR;
+	}
+	ac->current->olddn = req->op.rename.olddn;
+	ac->current->newdn = req->op.rename.newdn;
+	ac->list = ac->current;
+
+	ret = ldb_build_search_req(&search_req, module->ldb, ac,
 				   req->op.rename.olddn, 
 				   LDB_SCOPE_SUBTREE,
 				   "(objectClass=*)",
 				   attrs,
-				   req->controls,
+				   NULL,
 				   ac, 
-				   subtree_rename_search_callback);
-
-	if (ret != LDB_SUCCESS) {
-		return ret;
-	}
-
-	ret = ldb_set_timeout_from_prev_req(module->ldb, req, new_req);
-	
+				   subtree_rename_search_callback,
+				   req);
 	if (ret != LDB_SUCCESS) {
 		return ret;
 	}
 
-	ac->down_req = talloc_realloc(ac, ac->down_req, 
-					struct ldb_request *, ac->num_requests + 1);
-	if (!ac->down_req) {
-		ldb_oom(ac->module->ldb);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	ac->down_req[ac->num_requests] = new_req;
-	if (req == NULL) {
-		ldb_oom(ac->module->ldb);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	ac->num_requests++;
-	return ldb_next_request(module, new_req);
-}
-
-
-static int subtree_rename_wait_none(struct ldb_handle *handle) {
-	struct subtree_rename_context *ac;
-	int i, ret = LDB_ERR_OPERATIONS_ERROR;
-	if (!handle || !handle->private_data) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
-	if (handle->state == LDB_ASYNC_DONE) {
-		return handle->status;
-	}
-
-	handle->state = LDB_ASYNC_PENDING;
-	handle->status = LDB_SUCCESS;
-
-	ac = talloc_get_type(handle->private_data, struct subtree_rename_context);
-
-	for (i=0; i < ac->num_requests; i++) {
-		ret = ldb_wait(ac->down_req[i]->handle, LDB_WAIT_NONE);
-		
-		if (ret != LDB_SUCCESS) {
-			handle->status = ret;
-			goto done;
-		}
-		if (ac->down_req[i]->handle->status != LDB_SUCCESS) {
-			handle->status = ac->down_req[i]->handle->status;
-			goto done;
-		}
-		
-		if (ac->down_req[i]->handle->state != LDB_ASYNC_DONE) {
-			return LDB_SUCCESS;
-		}
-	}
-
-done:
-	handle->state = LDB_ASYNC_DONE;
-	return ret;
-
-}
-
-static int subtree_rename_wait_all(struct ldb_handle *handle) {
-
-	int ret;
-
-	while (handle->state != LDB_ASYNC_DONE) {
-		ret = subtree_rename_wait_none(handle);
-		if (ret != LDB_SUCCESS) {
-			return ret;
-		}
-	}
-
-	return handle->status;
-}
-
-static int subtree_rename_wait(struct ldb_handle *handle, enum ldb_wait_type type)
-{
-	if (type == LDB_WAIT_ALL) {
-		return subtree_rename_wait_all(handle);
-	} else {
-		return subtree_rename_wait_none(handle);
-	}
+	return ldb_next_request(module, search_req);
 }
 
 const struct ldb_module_ops ldb_subtree_rename_module_ops = {
 	.name		   = "subtree_rename",
 	.rename            = subtree_rename,
-	.wait              = subtree_rename_wait,
 };