summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-10-16 16:25:49 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-10-21 22:43:54 +1100
commitc106017f9ae20c5b58a960b83f50f0d95b78868d (patch)
treed7644ee94f5d9fbd5c213f6c417ebcf193b0093c
parent96c9bc18d5ebb62c5ac04a193574db149cffe212 (diff)
downloadsamba-c106017f9ae20c5b58a960b83f50f0d95b78868d.tar.gz
samba-c106017f9ae20c5b58a960b83f50f0d95b78868d.tar.bz2
samba-c106017f9ae20c5b58a960b83f50f0d95b78868d.zip
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
-rw-r--r--source4/dsdb/samdb/ldb_modules/partition.c17
1 files changed, 1 insertions, 16 deletions
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);