From c106017f9ae20c5b58a960b83f50f0d95b78868d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 16 Oct 2009 16:25:49 +1100 Subject: s4:dsdb Remove workaround for two partition head records The problem here has been avoided in repl_meta_data, and so this is no longer required. Andrew Bartlett --- source4/dsdb/samdb/ldb_modules/partition.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'source4') diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c index 64ec798e4c..779b8b5a35 100644 --- a/source4/dsdb/samdb/ldb_modules/partition.c +++ b/source4/dsdb/samdb/ldb_modules/partition.c @@ -158,7 +158,7 @@ static int partition_req_callback(struct ldb_request *req, struct partition_context *ac; struct ldb_module *module; struct ldb_request *nreq; - int ret, i; + int ret; struct partition_private_data *data; struct ldb_control *partition_ctrl; @@ -203,21 +203,6 @@ static int partition_req_callback(struct ldb_request *req, return ldb_module_done(ac->req, NULL, NULL, LDB_ERR_OPERATIONS_ERROR); } - 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); -- cgit