s4:dsdb Rework modules create new partitions at runtime
[ira/wip.git] / source4 / dsdb / samdb / ldb_modules / partition.c
index 2a321e29c50d0c713117cc6aab8e5554b839c6da..f6031fb944e58962a1318256d9f84f182aa3e61a 100644 (file)
@@ -4,10 +4,6 @@
    Copyright (C) Andrew Bartlett <abartlet@samba.org> 2006
    Copyright (C) Stefan Metzmacher <metze@samba.org> 2007
 
-   * NOTICE: this module is NOT released under the GNU LGPL license as
-   * other ldb code. This module is release under the GNU GPL v3 or
-   * later license.
-
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
  *  Author: Stefan Metzmacher
  */
 
-#include "includes.h"
-#include "ldb/include/ldb_includes.h"
-#include "dsdb/samdb/samdb.h"
-
-struct partition_private_data {
-       struct dsdb_control_current_partition **partitions;
-       struct ldb_dn **replicate;
-};
+#include "dsdb/samdb/ldb_modules/partition.h"
 
 struct part_request {
        struct ldb_module *module;
@@ -63,7 +52,7 @@ static struct partition_context *partition_init_ctx(struct ldb_module *module, s
 
        ac = talloc_zero(req, struct partition_context);
        if (ac == NULL) {
-               ldb_set_errstring(module->ldb, "Out of Memory");
+               ldb_set_errstring(ldb_module_get_ctx(module), "Out of Memory");
                return NULL;
        }
 
@@ -73,16 +62,6 @@ static struct partition_context *partition_init_ctx(struct ldb_module *module, s
        return ac;
 }
 
-#define PARTITION_FIND_OP(module, op) do { \
-       struct ldb_context *ldbctx = module->ldb; \
-        while (module && module->ops->op == NULL) module = module->next; \
-        if (module == NULL) { \
-                ldb_asprintf_errstring(ldbctx, \
-                       "Unable to find backend operation for " #op ); \
-                return LDB_ERR_OPERATIONS_ERROR; \
-        } \
-} while (0)
-
 /*
  *    helper functions to call the next module in chain
  *    */
@@ -123,9 +102,9 @@ static int partition_request(struct ldb_module *module, struct ldb_request *requ
        if (ret == LDB_SUCCESS) {
                return ret;
        }
-       if (!ldb_errstring(module->ldb)) {
+       if (!ldb_errstring(ldb_module_get_ctx(module))) {
                /* Set a default error string, to place the blame somewhere */
-               ldb_asprintf_errstring(module->ldb,
+               ldb_asprintf_errstring(ldb_module_get_ctx(module),
                                        "error in module %s: %s (%d)",
                                        module->ops->name,
                                        ldb_strerror(ret), ret);
@@ -133,22 +112,42 @@ static int partition_request(struct ldb_module *module, struct ldb_request *requ
        return ret;
 }
 
-static struct dsdb_control_current_partition *find_partition(struct partition_private_data *data,
-                                                            struct ldb_dn *dn)
+static struct dsdb_partition *find_partition(struct partition_private_data *data,
+                                            struct ldb_dn *dn,
+                                            struct ldb_request *req)
 {
        int i;
+       struct ldb_control *partition_ctrl;
+
+       /* see if the request has the partition DN specified in a
+        * control. The repl_meta_data module can specify this to
+        * ensure that replication happens to the right partition
+        */
+       partition_ctrl = ldb_request_get_control(req, DSDB_CONTROL_CURRENT_PARTITION_OID);
+       if (partition_ctrl) {
+               const struct dsdb_control_current_partition *partition;
+               partition = talloc_get_type(partition_ctrl->data,
+                                           struct dsdb_control_current_partition);
+               if (partition != NULL) {
+                       dn = partition->dn;
+               }
+       }
+
+       if (dn == NULL) {
+               return NULL;
+       }
 
        /* Look at base DN */
        /* Figure out which partition it is under */
-       /* Skip the lot if 'data' isn't here yet (initialistion) */
+       /* Skip the lot if 'data' isn't here yet (initialisation) */
        for (i=0; data && data->partitions && data->partitions[i]; i++) {
-               if (ldb_dn_compare_base(data->partitions[i]->dn, dn) == 0) {
+               if (ldb_dn_compare_base(data->partitions[i]->ctrl->dn, dn) == 0) {
                        return data->partitions[i];
                }
        }
 
        return NULL;
-};
+}
 
 /**
  * fire the caller's callback for every entry, but only send 'done' once.
@@ -159,9 +158,11 @@ static int partition_req_callback(struct ldb_request *req,
        struct partition_context *ac;
        struct ldb_module *module;
        struct ldb_request *nreq;
-       int ret;
+       int ret, i;
+       struct partition_private_data *data;
 
        ac = talloc_get_type(req->context, struct partition_context);
+       data = talloc_get_type(ac->module->private_data, struct partition_private_data);
 
        if (!ares) {
                return ldb_module_done(ac->req, NULL, NULL,
@@ -180,13 +181,29 @@ static int partition_req_callback(struct ldb_request *req,
 
        case LDB_REPLY_ENTRY:
                if (ac->req->operation != LDB_SEARCH) {
-                       ldb_set_errstring(ac->module->ldb,
+                       ldb_set_errstring(ldb_module_get_ctx(ac->module),
                                "partition_req_callback:"
                                " Unsupported reply type for this request");
                        return ldb_module_done(ac->req, NULL, NULL,
                                                LDB_ERR_OPERATIONS_ERROR);
                }
-               return ldb_module_send_entry(ac->req, ares->message);
+               for (i=0; data && data->partitions && data->partitions[i]; i++) {
+                       if (ldb_dn_compare(ares->message->dn, data->partitions[i]->ctrl->dn) == 0) {
+                               struct ldb_control *part_control;
+                               /* this is a partition root message - make
+                                  sure it isn't one of our fake root
+                                  entries from a parent partition */
+                               part_control = ldb_request_get_control(req, DSDB_CONTROL_CURRENT_PARTITION_OID);
+                               if (part_control && part_control->data != data->partitions[i]->ctrl) {
+                                       DEBUG(6,(__location__ ": Discarding partition mount object %s\n",
+                                                ldb_dn_get_linearized(ares->message->dn)));
+                                       talloc_free(ares);
+                                       return LDB_SUCCESS;
+                               }
+                       }
+               }
+               
+               return ldb_module_send_entry(ac->req, ares->message, ares->controls);
 
        case LDB_REPLY_DONE:
                if (ares->error == LDB_SUCCESS) {
@@ -196,7 +213,7 @@ static int partition_req_callback(struct ldb_request *req,
                        /* FIXME: check for ares->response, replmd does not fill it ! */
                        if (ares->response) {
                                if (strcmp(ares->response->oid, LDB_EXTENDED_START_TLS_OID) != 0) {
-                                       ldb_set_errstring(ac->module->ldb,
+                                       ldb_set_errstring(ldb_module_get_ctx(ac->module),
                                                          "partition_req_callback:"
                                                          " Unknown extended reply, "
                                                          "only supports START_TLS");
@@ -233,7 +250,7 @@ static int partition_req_callback(struct ldb_request *req,
 }
 
 static int partition_prep_request(struct partition_context *ac,
-                                 struct dsdb_control_current_partition *partition)
+                                 struct dsdb_partition *partition)
 {
        int ret;
        struct ldb_request *req;
@@ -242,13 +259,13 @@ static int partition_prep_request(struct partition_context *ac,
                                        struct part_request,
                                        ac->num_requests + 1);
        if (ac->part_req == NULL) {
-               ldb_oom(ac->module->ldb);
+               ldb_oom(ldb_module_get_ctx(ac->module));
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
        switch (ac->req->operation) {
        case LDB_SEARCH:
-               ret = ldb_build_search_req_ex(&req, ac->module->ldb,
+               ret = ldb_build_search_req_ex(&req, ldb_module_get_ctx(ac->module),
                                        ac->part_req,
                                        ac->req->op.search.base,
                                        ac->req->op.search.scope,
@@ -259,28 +276,28 @@ static int partition_prep_request(struct partition_context *ac,
                                        ac->req);
                break;
        case LDB_ADD:
-               ret = ldb_build_add_req(&req, ac->module->ldb, ac->part_req,
+               ret = ldb_build_add_req(&req, ldb_module_get_ctx(ac->module), ac->part_req,
                                        ac->req->op.add.message,
                                        ac->req->controls,
                                        ac, partition_req_callback,
                                        ac->req);
                break;
        case LDB_MODIFY:
-               ret = ldb_build_mod_req(&req, ac->module->ldb, ac->part_req,
+               ret = ldb_build_mod_req(&req, ldb_module_get_ctx(ac->module), ac->part_req,
                                        ac->req->op.mod.message,
                                        ac->req->controls,
                                        ac, partition_req_callback,
                                        ac->req);
                break;
        case LDB_DELETE:
-               ret = ldb_build_del_req(&req, ac->module->ldb, ac->part_req,
+               ret = ldb_build_del_req(&req, ldb_module_get_ctx(ac->module), ac->part_req,
                                        ac->req->op.del.dn,
                                        ac->req->controls,
                                        ac, partition_req_callback,
                                        ac->req);
                break;
        case LDB_RENAME:
-               ret = ldb_build_rename_req(&req, ac->module->ldb, ac->part_req,
+               ret = ldb_build_rename_req(&req, ldb_module_get_ctx(ac->module), ac->part_req,
                                        ac->req->op.rename.olddn,
                                        ac->req->op.rename.newdn,
                                        ac->req->controls,
@@ -288,7 +305,7 @@ static int partition_prep_request(struct partition_context *ac,
                                        ac->req);
                break;
        case LDB_EXTENDED:
-               ret = ldb_build_extended_req(&req, ac->module->ldb,
+               ret = ldb_build_extended_req(&req, ldb_module_get_ctx(ac->module),
                                        ac->part_req,
                                        ac->req->op.extended.oid,
                                        ac->req->op.extended.data,
@@ -297,7 +314,7 @@ static int partition_prep_request(struct partition_context *ac,
                                        ac->req);
                break;
        default:
-               ldb_set_errstring(ac->module->ldb,
+               ldb_set_errstring(ldb_module_get_ctx(ac->module),
                                  "Unsupported request type!");
                ret = LDB_ERR_UNWILLING_TO_PERFORM;
        }
@@ -312,7 +329,7 @@ static int partition_prep_request(struct partition_context *ac,
                req->controls = talloc_memdup(req, ac->req->controls,
                                        talloc_get_size(ac->req->controls));
                if (req->controls == NULL) {
-                       ldb_oom(ac->module->ldb);
+                       ldb_oom(ldb_module_get_ctx(ac->module));
                        return LDB_ERR_OPERATIONS_ERROR;
                }
        }
@@ -320,20 +337,22 @@ static int partition_prep_request(struct partition_context *ac,
        if (partition) {
                ac->part_req[ac->num_requests].module = partition->module;
 
-               ret = ldb_request_add_control(req,
-                                       DSDB_CONTROL_CURRENT_PARTITION_OID,
-                                       false, partition);
-               if (ret != LDB_SUCCESS) {
-                       return ret;
+               if (!ldb_request_get_control(req, DSDB_CONTROL_CURRENT_PARTITION_OID)) {
+                       ret = ldb_request_add_control(req,
+                                                     DSDB_CONTROL_CURRENT_PARTITION_OID,
+                                                     false, partition->ctrl);
+                       if (ret != LDB_SUCCESS) {
+                               return ret;
+                       }
                }
 
                if (req->operation == LDB_SEARCH) {
                        /* If the search is for 'more' than this partition,
                         * then change the basedn, so a remote LDAP server
                         * doesn't object */
-                       if (ldb_dn_compare_base(partition->dn,
+                       if (ldb_dn_compare_base(partition->ctrl->dn,
                                                req->op.search.base) != 0) {
-                               req->op.search.base = partition->dn;
+                               req->op.search.base = partition->ctrl->dn;
                        }
                }
 
@@ -387,7 +406,7 @@ static int partition_replicate(struct ldb_module *module, struct ldb_request *re
        struct partition_context *ac;
        unsigned i;
        int ret;
-       struct dsdb_control_current_partition *partition;
+       struct dsdb_partition *partition;
        struct partition_private_data *data = talloc_get_type(module->private_data, 
                                                              struct partition_private_data);
        if (!data || !data->partitions) {
@@ -413,7 +432,7 @@ static int partition_replicate(struct ldb_module *module, struct ldb_request *re
        /* Otherwise, we need to find the partition to fire it to */
 
        /* Find partition */
-       partition = find_partition(data, dn);
+       partition = find_partition(data, dn, req);
        if (!partition) {
                /*
                 * if we haven't found a matching partition
@@ -445,10 +464,10 @@ static int partition_replicate(struct ldb_module *module, struct ldb_request *re
 static int partition_search(struct ldb_module *module, struct ldb_request *req)
 {
        struct ldb_control **saved_controls;
-       
        /* Find backend */
        struct partition_private_data *data = talloc_get_type(module->private_data, 
                                                              struct partition_private_data);
+
        /* issue request */
 
        /* (later) consider if we should be searching multiple
@@ -458,13 +477,24 @@ static int partition_search(struct ldb_module *module, struct ldb_request *req)
        struct ldb_control *domain_scope_control = ldb_request_get_control(req, LDB_CONTROL_DOMAIN_SCOPE_OID);
        
        struct ldb_search_options_control *search_options = NULL;
+       struct dsdb_partition *p;
+       
+       p = find_partition(data, NULL, req);
+       if (p != NULL) {
+               /* the caller specified what partition they want the
+                * search - just pass it on
+                */
+               return ldb_next_request(p->module, req);                
+       }
+
+
        if (search_control) {
                search_options = talloc_get_type(search_control->data, struct ldb_search_options_control);
        }
 
        /* Remove the domain_scope control, so we don't confuse a backend server */
        if (domain_scope_control && !save_controls(domain_scope_control, req, &saved_controls)) {
-               ldb_oom(module->ldb);
+               ldb_oom(ldb_module_get_ctx(module));
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
@@ -488,7 +518,7 @@ static int partition_search(struct ldb_module *module, struct ldb_request *req)
 
                        /* Remove search control, so we don't confuse a backend server */
                        if (search_control && !save_controls(search_control, req, &saved_controls)) {
-                               ldb_oom(module->ldb);
+                               ldb_oom(ldb_module_get_ctx(module));
                                return LDB_ERR_OPERATIONS_ERROR;
                        }
                }
@@ -514,19 +544,19 @@ static int partition_search(struct ldb_module *module, struct ldb_request *req)
                              or
                              3) the DN we are looking for is a child of the partition
                         */
-                       if (ldb_dn_compare(data->partitions[i]->dn, req->op.search.base) == 0) {
+                       if (ldb_dn_compare(data->partitions[i]->ctrl->dn, req->op.search.base) == 0) {
                                match = true;
                                if (req->op.search.scope == LDB_SCOPE_BASE) {
                                        stop = true;
                                }
                        }
                        if (!match && 
-                           (ldb_dn_compare_base(req->op.search.base, data->partitions[i]->dn) == 0 &&
+                           (ldb_dn_compare_base(req->op.search.base, data->partitions[i]->ctrl->dn) == 0 &&
                             req->op.search.scope != LDB_SCOPE_BASE)) {
                                match = true;
                        }
                        if (!match &&
-                           ldb_dn_compare_base(data->partitions[i]->dn, req->op.search.base) == 0) {
+                           ldb_dn_compare_base(data->partitions[i]->ctrl->dn, req->op.search.base) == 0) {
                                match = true;
                                stop = true; /* note that this relies on partition ordering */
                        }
@@ -555,7 +585,7 @@ static int partition_search(struct ldb_module *module, struct ldb_request *req)
 
                        /* Remove search control, so we don't confuse a backend server */
                        if (search_control && !save_controls(search_control, req, &saved_controls)) {
-                               ldb_oom(module->ldb);
+                               ldb_oom(ldb_module_get_ctx(module));
                                return LDB_ERR_OPERATIONS_ERROR;
                        }
                }
@@ -586,30 +616,30 @@ static int partition_delete(struct ldb_module *module, struct ldb_request *req)
 static int partition_rename(struct ldb_module *module, struct ldb_request *req)
 {
        /* Find backend */
-       struct dsdb_control_current_partition *backend, *backend2;
+       struct dsdb_partition *backend, *backend2;
        
        struct partition_private_data *data = talloc_get_type(module->private_data, 
                                                              struct partition_private_data);
 
-       /* Skip the lot if 'data' isn't here yet (initialization) */
+       /* Skip the lot if 'data' isn't here yet (initialisation) */
        if (!data) {
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       backend = find_partition(data, req->op.rename.olddn);
-       backend2 = find_partition(data, req->op.rename.newdn);
+       backend = find_partition(data, req->op.rename.olddn, req);
+       backend2 = find_partition(data, req->op.rename.newdn, req);
 
        if ((backend && !backend2) || (!backend && backend2)) {
                return LDB_ERR_AFFECTS_MULTIPLE_DSAS;
        }
 
        if (backend != backend2) {
-               ldb_asprintf_errstring(module->ldb
+               ldb_asprintf_errstring(ldb_module_get_ctx(module)
                                       "Cannot rename from %s in %s to %s in %s: %s",
                                       ldb_dn_get_linearized(req->op.rename.olddn),
-                                      ldb_dn_get_linearized(backend->dn),
+                                      ldb_dn_get_linearized(backend->ctrl->dn),
                                       ldb_dn_get_linearized(req->op.rename.newdn),
-                                      ldb_dn_get_linearized(backend2->dn),
+                                      ldb_dn_get_linearized(backend2->ctrl->dn),
                                       ldb_strerror(LDB_ERR_AFFECTS_MULTIPLE_DSAS));
                return LDB_ERR_AFFECTS_MULTIPLE_DSAS;
        }
@@ -651,65 +681,74 @@ static int partition_start_trans(struct ldb_module *module)
        return LDB_SUCCESS;
 }
 
-/* end a transaction */
-static int partition_end_trans(struct ldb_module *module)
+/* prepare for a commit */
+static int partition_prepare_commit(struct ldb_module *module)
 {
-       int i, ret;
+       int i;
        struct partition_private_data *data = talloc_get_type(module->private_data, 
                                                              struct partition_private_data);
-       ret = ldb_next_end_trans(module);
-       if (ret != LDB_SUCCESS) {
-               return ret;
-       }
 
-       /* Look at base DN */
-       /* Figure out which partition it is under */
-       /* Skip the lot if 'data' isn't here yet (initialistion) */
        for (i=0; data && data->partitions && data->partitions[i]; i++) {
-               struct ldb_module *next = data->partitions[i]->module;
-               PARTITION_FIND_OP(next, end_transaction);
+               struct ldb_module *next_prepare = data->partitions[i]->module;
+               int ret;
+
+               PARTITION_FIND_OP_NOERROR(next_prepare, prepare_commit);
+               if (next_prepare == NULL) {
+                       continue;
+               }
 
-               ret = next->ops->end_transaction(next);
+               ret = next_prepare->ops->prepare_commit(next_prepare);
                if (ret != LDB_SUCCESS) {
-                       /* Back it out, if it fails on one */
-                       for (i--; i >= 0; i--) {
-                               next = data->partitions[i]->module;
-                               PARTITION_FIND_OP(next, del_transaction);
+                       return ret;
+               }
+       }
 
-                               next->ops->del_transaction(next);
-                       }
-                       ldb_next_del_trans(module);
+       return ldb_next_prepare_commit(module);
+}
+
+
+/* end a transaction */
+static int partition_end_trans(struct ldb_module *module)
+{
+       int i;
+       struct partition_private_data *data = talloc_get_type(module->private_data, 
+                                                             struct partition_private_data);
+       for (i=0; data && data->partitions && data->partitions[i]; i++) {
+               struct ldb_module *next_end = data->partitions[i]->module;
+               int ret;
+
+               PARTITION_FIND_OP(next_end, end_transaction);
+
+               ret = next_end->ops->end_transaction(next_end);
+               if (ret != LDB_SUCCESS) {
                        return ret;
                }
        }
 
-       return LDB_SUCCESS;
+       return ldb_next_end_trans(module);
 }
 
 /* delete a transaction */
 static int partition_del_trans(struct ldb_module *module)
 {
-       int i, ret, ret2 = LDB_SUCCESS;
+       int i, ret, final_ret = LDB_SUCCESS;
        struct partition_private_data *data = talloc_get_type(module->private_data, 
                                                              struct partition_private_data);
-       ret = ldb_next_del_trans(module);
-       if (ret != LDB_SUCCESS) {
-               ret2 = ret;
-       }
-
-       /* Look at base DN */
-       /* Figure out which partition it is under */
-       /* Skip the lot if 'data' isn't here yet (initialistion) */
        for (i=0; data && data->partitions && data->partitions[i]; i++) {
                struct ldb_module *next = data->partitions[i]->module;
                PARTITION_FIND_OP(next, del_transaction);
 
                ret = next->ops->del_transaction(next);
                if (ret != LDB_SUCCESS) {
-                       ret2 = ret;
+                       final_ret = ret;
                }
+       }       
+
+       ret = ldb_next_del_trans(module);
+       if (ret != LDB_SUCCESS) {
+               final_ret = ret;
        }
-       return ret2;
+       return final_ret;
 }
 
 
@@ -729,6 +768,15 @@ static int partition_sequence_number(struct ldb_module *module, struct ldb_reque
        struct ldb_seqnum_result *tseqr;
        struct ldb_extended *ext;
        struct ldb_result *res;
+       struct dsdb_partition *p;
+
+       p = find_partition(data, NULL, req);
+       if (p != NULL) {
+               /* the caller specified what partition they want the
+                * sequence number operation on - just pass it on
+                */
+               return ldb_next_request(p->module, req);                
+       }
 
        seq = talloc_get_type(req->op.extended.data, struct ldb_seqnum_request);
 
@@ -746,21 +794,29 @@ static int partition_sequence_number(struct ldb_module *module, struct ldb_reque
                }
                tseq->type = seq->type;
 
-               ret = ldb_build_extended_req(&treq, module->ldb, res,
+               ret = ldb_build_extended_req(&treq, ldb_module_get_ctx(module), res,
                                             LDB_EXTENDED_SEQUENCE_NUMBER,
                                             tseq,
                                             NULL,
                                             res,
                                             ldb_extended_default_callback,
                                             NULL);
-               ret = ldb_next_request(module, treq);
-               if (ret == LDB_SUCCESS) {
-                       ret = ldb_wait(treq->handle, LDB_WAIT_ALL);
+               if (ret != LDB_SUCCESS) {
+                       talloc_free(res);
+                       return ret;
                }
+
+               ret = ldb_next_request(module, treq);
                if (ret != LDB_SUCCESS) {
                        talloc_free(res);
                        return ret;
                }
+               ret = ldb_wait(treq->handle, LDB_WAIT_ALL);
+               if (ret != LDB_SUCCESS) {
+                       talloc_free(res);
+                       return ret;
+               }
+
                seqr = talloc_get_type(res->extended->data,
                                        struct ldb_seqnum_result);
                if (seqr->flags & LDB_SEQ_TIMESTAMP_SEQUENCE) {
@@ -770,7 +826,7 @@ static int partition_sequence_number(struct ldb_module *module, struct ldb_reque
                }
                talloc_free(res);
 
-               /* Skip the lot if 'data' isn't here yet (initialistion) */
+               /* Skip the lot if 'data' isn't here yet (initialisation) */
                for (i=0; data && data->partitions && data->partitions[i]; i++) {
 
                        res = talloc_zero(req, struct ldb_result);
@@ -784,7 +840,7 @@ static int partition_sequence_number(struct ldb_module *module, struct ldb_reque
                        }
                        tseq->type = seq->type;
 
-                       ret = ldb_build_extended_req(&treq, module->ldb, res,
+                       ret = ldb_build_extended_req(&treq, ldb_module_get_ctx(module), res,
                                                     LDB_EXTENDED_SEQUENCE_NUMBER,
                                                     tseq,
                                                     NULL,
@@ -796,12 +852,14 @@ static int partition_sequence_number(struct ldb_module *module, struct ldb_reque
                                return ret;
                        }
 
-                       ret = ldb_request_add_control(treq,
-                                                     DSDB_CONTROL_CURRENT_PARTITION_OID,
-                                                     false, data->partitions[i]);
-                       if (ret != LDB_SUCCESS) {
-                               talloc_free(res);
-                               return ret;
+                       if (!ldb_request_get_control(treq, DSDB_CONTROL_CURRENT_PARTITION_OID)) {
+                               ret = ldb_request_add_control(treq,
+                                                             DSDB_CONTROL_CURRENT_PARTITION_OID,
+                                                             false, data->partitions[i]->ctrl);
+                               if (ret != LDB_SUCCESS) {
+                                       talloc_free(res);
+                                       return ret;
+                               }
                        }
 
                        ret = partition_request(data->partitions[i]->module, treq);
@@ -839,7 +897,7 @@ static int partition_sequence_number(struct ldb_module *module, struct ldb_reque
                }
                tseq->type = LDB_SEQ_HIGHEST_TIMESTAMP;
 
-               ret = ldb_build_extended_req(&treq, module->ldb, res,
+               ret = ldb_build_extended_req(&treq, ldb_module_get_ctx(module), res,
                                             LDB_EXTENDED_SEQUENCE_NUMBER,
                                             tseq,
                                             NULL,
@@ -868,7 +926,7 @@ static int partition_sequence_number(struct ldb_module *module, struct ldb_reque
 
                talloc_free(res);
 
-               /* Skip the lot if 'data' isn't here yet (initialistion) */
+               /* Skip the lot if 'data' isn't here yet (initialisation) */
                for (i=0; data && data->partitions && data->partitions[i]; i++) {
 
                        res = talloc_zero(req, struct ldb_result);
@@ -883,7 +941,7 @@ static int partition_sequence_number(struct ldb_module *module, struct ldb_reque
                        }
                        tseq->type = LDB_SEQ_HIGHEST_TIMESTAMP;
 
-                       ret = ldb_build_extended_req(&treq, module->ldb, res,
+                       ret = ldb_build_extended_req(&treq, ldb_module_get_ctx(module), res,
                                                     LDB_EXTENDED_SEQUENCE_NUMBER,
                                                     tseq,
                                                     NULL,
@@ -895,6 +953,16 @@ static int partition_sequence_number(struct ldb_module *module, struct ldb_reque
                                return ret;
                        }
 
+                       if (!ldb_request_get_control(treq, DSDB_CONTROL_CURRENT_PARTITION_OID)) {
+                               ret = ldb_request_add_control(treq,
+                                                             DSDB_CONTROL_CURRENT_PARTITION_OID,
+                                                             false, data->partitions[i]->ctrl);
+                               if (ret != LDB_SUCCESS) {
+                                       talloc_free(res);
+                                       return ret;
+                               }
+                       }
+
                        ret = partition_request(data->partitions[i]->module, treq);
                        if (ret != LDB_SUCCESS) {
                                talloc_free(res);
@@ -959,28 +1027,9 @@ static int partition_sequence_number(struct ldb_module *module, struct ldb_reque
        return ldb_module_done(req, NULL, ext, LDB_SUCCESS);
 }
 
-static int partition_extended_replicated_objects(struct ldb_module *module, struct ldb_request *req)
-{
-       struct dsdb_extended_replicated_objects *ext;
-
-       ext = talloc_get_type(req->op.extended.data, struct dsdb_extended_replicated_objects);
-       if (!ext) {
-               ldb_debug(module->ldb, LDB_DEBUG_FATAL, "partition_extended_replicated_objects: invalid extended data\n");
-               return LDB_ERR_PROTOCOL_ERROR;
-       }
-
-       if (ext->version != DSDB_EXTENDED_REPLICATED_OBJECTS_VERSION) {
-               ldb_debug(module->ldb, LDB_DEBUG_FATAL, "partition_extended_replicated_objects: extended data invalid version [%u != %u]\n",
-                         ext->version, DSDB_EXTENDED_REPLICATED_OBJECTS_VERSION);
-               return LDB_ERR_PROTOCOL_ERROR;
-       }
-
-       return partition_replicate(module, req, ext->partition_dn);
-}
-
 static int partition_extended_schema_update_now(struct ldb_module *module, struct ldb_request *req)
 {
-       struct dsdb_control_current_partition *partition;
+       struct dsdb_partition *partition;
        struct partition_private_data *data;
        struct ldb_dn *schema_dn;
        struct partition_context *ac;
@@ -988,7 +1037,7 @@ static int partition_extended_schema_update_now(struct ldb_module *module, struc
 
        schema_dn = talloc_get_type(req->op.extended.data, struct ldb_dn);
        if (!schema_dn) {
-               ldb_debug(module->ldb, LDB_DEBUG_FATAL, "partition_extended: invalid extended data\n");
+               ldb_debug(ldb_module_get_ctx(module), LDB_DEBUG_FATAL, "partition_extended: invalid extended data\n");
                return LDB_ERR_PROTOCOL_ERROR;
        }
 
@@ -997,7 +1046,7 @@ static int partition_extended_schema_update_now(struct ldb_module *module, struc
                return LDB_ERR_OPERATIONS_ERROR;
        }
        
-       partition = find_partition( data, schema_dn );
+       partition = find_partition( data, schema_dn, req);
        if (!partition) {
                return ldb_next_request(module, req);
        }
@@ -1014,7 +1063,13 @@ static int partition_extended_schema_update_now(struct ldb_module *module, struc
        }
 
        /* fire the first one */
-       return partition_call_first(ac);
+       ret = partition_call_first(ac);
+
+       if (ret != LDB_SUCCESS){
+               return ret;
+       }
+
+       return ldb_request_done(req, ret);
 }
 
 
@@ -1025,7 +1080,7 @@ static int partition_extended(struct ldb_module *module, struct ldb_request *req
        struct partition_context *ac;
 
        data = talloc_get_type(module->private_data, struct partition_private_data);
-       if (!data || !data->partitions) {
+       if (!data) {
                return ldb_next_request(module, req);
        }
 
@@ -1033,8 +1088,8 @@ static int partition_extended(struct ldb_module *module, struct ldb_request *req
                return partition_sequence_number(module, req);
        }
 
-       if (strcmp(req->op.extended.oid, DSDB_EXTENDED_REPLICATED_OBJECTS_OID) == 0) {
-               return partition_extended_replicated_objects(module, req);
+       if (strcmp(req->op.extended.oid, DSDB_EXTENDED_CREATE_PARTITION_OID) == 0) {
+               return partition_create(module, req);
        }
 
        /* forward schemaUpdateNow operation to schema_fsmo module*/
@@ -1055,273 +1110,6 @@ static int partition_extended(struct ldb_module *module, struct ldb_request *req
        return partition_send_all(module, ac, req);
 }
 
-static int partition_sort_compare(const void *v1, const void *v2)
-{
-       struct dsdb_control_current_partition *p1;
-       struct dsdb_control_current_partition *p2;
-
-       p1 = *((struct dsdb_control_current_partition **)v1);
-       p2 = *((struct dsdb_control_current_partition **)v2);
-
-       return ldb_dn_compare(p1->dn, p2->dn);
-}
-
-static int partition_init(struct ldb_module *module)
-{
-       int ret, i;
-       TALLOC_CTX *mem_ctx = talloc_new(module);
-       const char *attrs[] = { "partition", "replicateEntries", "modules", NULL };
-       struct ldb_result *res;
-       struct ldb_message *msg;
-       struct ldb_message_element *partition_attributes;
-       struct ldb_message_element *replicate_attributes;
-       struct ldb_message_element *modules_attributes;
-
-       struct partition_private_data *data;
-
-       if (!mem_ctx) {
-               return LDB_ERR_OPERATIONS_ERROR;
-       }
-
-       data = talloc(mem_ctx, struct partition_private_data);
-       if (data == NULL) {
-               return LDB_ERR_OPERATIONS_ERROR;
-       }
-
-       ret = ldb_search(module->ldb, mem_ctx, &res,
-                        ldb_dn_new(mem_ctx, module->ldb, "@PARTITION"),
-                        LDB_SCOPE_BASE, attrs, NULL);
-       if (ret != LDB_SUCCESS) {
-               talloc_free(mem_ctx);
-               return ret;
-       }
-       if (res->count == 0) {
-               talloc_free(mem_ctx);
-               return ldb_next_init(module);
-       }
-
-       if (res->count > 1) {
-               talloc_free(mem_ctx);
-               return LDB_ERR_CONSTRAINT_VIOLATION;
-       }
-
-       msg = res->msgs[0];
-
-       partition_attributes = ldb_msg_find_element(msg, "partition");
-       if (!partition_attributes) {
-               ldb_set_errstring(module->ldb, "partition_init: no partitions specified");
-               talloc_free(mem_ctx);
-               return LDB_ERR_CONSTRAINT_VIOLATION;
-       }
-       data->partitions = talloc_array(data, struct dsdb_control_current_partition *, partition_attributes->num_values + 1);
-       if (!data->partitions) {
-               talloc_free(mem_ctx);
-               return LDB_ERR_OPERATIONS_ERROR;
-       }
-       for (i=0; i < partition_attributes->num_values; i++) {
-               char *base = talloc_strdup(data->partitions, (char *)partition_attributes->values[i].data);
-               char *p = strchr(base, ':');
-               if (!p) {
-                       ldb_asprintf_errstring(module->ldb, 
-                                               "partition_init: "
-                                               "invalid form for partition record (missing ':'): %s", base);
-                       talloc_free(mem_ctx);
-                       return LDB_ERR_CONSTRAINT_VIOLATION;
-               }
-               p[0] = '\0';
-               p++;
-               if (!p[0]) {
-                       ldb_asprintf_errstring(module->ldb, 
-                                               "partition_init: "
-                                               "invalid form for partition record (missing backend database): %s", base);
-                       talloc_free(mem_ctx);
-                       return LDB_ERR_CONSTRAINT_VIOLATION;
-               }
-               data->partitions[i] = talloc(data->partitions, struct dsdb_control_current_partition);
-               if (!data->partitions[i]) {
-                       talloc_free(mem_ctx);
-                       return LDB_ERR_OPERATIONS_ERROR;
-               }
-               data->partitions[i]->version = DSDB_CONTROL_CURRENT_PARTITION_VERSION;
-
-               data->partitions[i]->dn = ldb_dn_new(data->partitions[i], module->ldb, base);
-               if (!data->partitions[i]->dn) {
-                       ldb_asprintf_errstring(module->ldb, 
-                                               "partition_init: invalid DN in partition record: %s", base);
-                       talloc_free(mem_ctx);
-                       return LDB_ERR_CONSTRAINT_VIOLATION;
-               }
-
-               data->partitions[i]->backend = samdb_relative_path(module->ldb, 
-                                                                  data->partitions[i], 
-                                                                  p);
-               if (!data->partitions[i]->backend) {
-                       ldb_asprintf_errstring(module->ldb, 
-                                               "partition_init: unable to determine an relative path for partition: %s", base);
-                       talloc_free(mem_ctx);                   
-               }
-               ret = ldb_connect_backend(module->ldb, data->partitions[i]->backend, NULL, &data->partitions[i]->module);
-               if (ret != LDB_SUCCESS) {
-                       talloc_free(mem_ctx);
-                       return ret;
-               }
-       }
-       data->partitions[i] = NULL;
-
-       /* sort these into order, most to least specific */
-       qsort(data->partitions, partition_attributes->num_values,
-             sizeof(*data->partitions), partition_sort_compare);
-
-       for (i=0; data->partitions[i]; i++) {
-               struct ldb_request *req;
-               req = talloc_zero(mem_ctx, struct ldb_request);
-               if (req == NULL) {
-                       ldb_debug(module->ldb, LDB_DEBUG_ERROR, "partition: Out of memory!\n");
-                       talloc_free(mem_ctx);
-                       return LDB_ERR_OPERATIONS_ERROR;
-               }
-               
-               req->operation = LDB_REQ_REGISTER_PARTITION;
-               req->op.reg_partition.dn = data->partitions[i]->dn;
-               req->callback = ldb_op_default_callback;
-
-               ldb_set_timeout(module->ldb, req, 0);
-
-               req->handle = ldb_handle_new(req, module->ldb);
-               if (req->handle == NULL) {
-                       return LDB_ERR_OPERATIONS_ERROR;
-               }
-               
-               ret = ldb_request(module->ldb, req);
-               if (ret == LDB_SUCCESS) {
-                       ret = ldb_wait(req->handle, LDB_WAIT_ALL);
-               }
-               if (ret != LDB_SUCCESS) {
-                       ldb_debug(module->ldb, LDB_DEBUG_ERROR, "partition: Unable to register partition with rootdse!\n");
-                       talloc_free(mem_ctx);
-                       return LDB_ERR_OTHER;
-               }
-               talloc_free(req);
-       }
-
-       replicate_attributes = ldb_msg_find_element(msg, "replicateEntries");
-       if (!replicate_attributes) {
-               data->replicate = NULL;
-       } else {
-               data->replicate = talloc_array(data, struct ldb_dn *, replicate_attributes->num_values + 1);
-               if (!data->replicate) {
-                       talloc_free(mem_ctx);
-                       return LDB_ERR_OPERATIONS_ERROR;
-               }
-
-               for (i=0; i < replicate_attributes->num_values; i++) {
-                       data->replicate[i] = ldb_dn_from_ldb_val(data->replicate, module->ldb, &replicate_attributes->values[i]);
-                       if (!ldb_dn_validate(data->replicate[i])) {
-                               ldb_asprintf_errstring(module->ldb, 
-                                                       "partition_init: "
-                                                       "invalid DN in partition replicate record: %s", 
-                                                       replicate_attributes->values[i].data);
-                               talloc_free(mem_ctx);
-                               return LDB_ERR_CONSTRAINT_VIOLATION;
-                       }
-               }
-               data->replicate[i] = NULL;
-       }
-
-       /* Make the private data available to any searches the modules may trigger in initialisation */
-       module->private_data = data;
-       talloc_steal(module, data);
-       
-       modules_attributes = ldb_msg_find_element(msg, "modules");
-       if (modules_attributes) {
-               for (i=0; i < modules_attributes->num_values; i++) {
-                       struct ldb_dn *base_dn;
-                       int partition_idx;
-                       struct dsdb_control_current_partition *partition = NULL;
-                       const char **modules = NULL;
-
-                       char *base = talloc_strdup(data->partitions, (char *)modules_attributes->values[i].data);
-                       char *p = strchr(base, ':');
-                       if (!p) {
-                               ldb_asprintf_errstring(module->ldb, 
-                                                       "partition_init: "
-                                                       "invalid form for partition module record (missing ':'): %s", base);
-                               talloc_free(mem_ctx);
-                               return LDB_ERR_CONSTRAINT_VIOLATION;
-                       }
-                       p[0] = '\0';
-                       p++;
-                       if (!p[0]) {
-                               ldb_asprintf_errstring(module->ldb, 
-                                                       "partition_init: "
-                                                       "invalid form for partition module record (missing backend database): %s", base);
-                               talloc_free(mem_ctx);
-                               return LDB_ERR_CONSTRAINT_VIOLATION;
-                       }
-
-                       modules = ldb_modules_list_from_string(module->ldb, mem_ctx,
-                                                              p);
-                       
-                       base_dn = ldb_dn_new(mem_ctx, module->ldb, base);
-                       if (!ldb_dn_validate(base_dn)) {
-                               talloc_free(mem_ctx);
-                               return LDB_ERR_OPERATIONS_ERROR;
-                       }
-                       
-                       for (partition_idx = 0; data->partitions[partition_idx]; partition_idx++) {
-                               if (ldb_dn_compare(data->partitions[partition_idx]->dn, base_dn) == 0) {
-                                       partition = data->partitions[partition_idx];
-                                       break;
-                               }
-                       }
-                       
-                       if (!partition) {
-                               ldb_asprintf_errstring(module->ldb, 
-                                                       "partition_init: "
-                                                       "invalid form for partition module record (no such partition): %s", base);
-                               talloc_free(mem_ctx);
-                               return LDB_ERR_CONSTRAINT_VIOLATION;
-                       }
-                       
-                       ret = ldb_load_modules_list(module->ldb, modules, partition->module, &partition->module);
-                       if (ret != LDB_SUCCESS) {
-                               ldb_asprintf_errstring(module->ldb, 
-                                                      "partition_init: "
-                                                      "loading backend for %s failed: %s", 
-                                                      base, ldb_errstring(module->ldb));
-                               talloc_free(mem_ctx);
-                               return ret;
-                       }
-                       ret = ldb_init_module_chain(module->ldb, partition->module);
-                       if (ret != LDB_SUCCESS) {
-                               ldb_asprintf_errstring(module->ldb, 
-                                                      "partition_init: "
-                                                      "initialising backend for %s failed: %s", 
-                                                      base, ldb_errstring(module->ldb));
-                               talloc_free(mem_ctx);
-                               return ret;
-                       }
-               }
-       }
-
-       ret = ldb_mod_register_control(module, LDB_CONTROL_DOMAIN_SCOPE_OID);
-       if (ret != LDB_SUCCESS) {
-               ldb_debug(module->ldb, LDB_DEBUG_ERROR,
-                       "partition: Unable to register control with rootdse!\n");
-               return LDB_ERR_OPERATIONS_ERROR;
-       }
-
-       ret = ldb_mod_register_control(module, LDB_CONTROL_SEARCH_OPTIONS_OID);
-       if (ret != LDB_SUCCESS) {
-               ldb_debug(module->ldb, LDB_DEBUG_ERROR,
-                       "partition: Unable to register control with rootdse!\n");
-               return LDB_ERR_OPERATIONS_ERROR;
-       }
-
-       talloc_free(mem_ctx);
-       return ldb_next_init(module);
-}
-
 _PUBLIC_ const struct ldb_module_ops ldb_partition_module_ops = {
        .name              = "partition",
        .init_context      = partition_init,
@@ -1332,6 +1120,7 @@ _PUBLIC_ const struct ldb_module_ops ldb_partition_module_ops = {
        .rename            = partition_rename,
        .extended          = partition_extended,
        .start_transaction = partition_start_trans,
+       .prepare_commit    = partition_prepare_commit,
        .end_transaction   = partition_end_trans,
        .del_transaction   = partition_del_trans,
 };