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
*/
#include "includes.h"
+#include "lib/ldb/include/ldb.h"
+#include "lib/ldb/include/ldb_errors.h"
+#include "lib/ldb/include/ldb_module.h"
#include "lib/ldb/include/ldb_private.h"
#include "dsdb/samdb/samdb.h"
+struct dsdb_partition {
+ struct ldb_module *module;
+ struct dsdb_control_current_partition *ctrl;
+};
+
struct partition_private_data {
- struct dsdb_control_current_partition **partitions;
+ struct dsdb_partition **partitions;
struct ldb_dn **replicate;
};
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;
}
#define PARTITION_FIND_OP(module, op) do { \
PARTITION_FIND_OP_NOERROR(module, op); \
if (module == NULL) { \
- ldb_asprintf_errstring(module->ldb, \
+ ldb_asprintf_errstring(ldb_module_get_ctx(module), \
"Unable to find backend operation for " #op ); \
return LDB_ERR_OPERATIONS_ERROR; \
} \
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);
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];
}
}
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,
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);
}
+ 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:
/* 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");
}
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;
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,
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,
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,
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;
}
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;
}
}
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;
}
}
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) {
/* 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
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
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;
}
/* 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;
}
}
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 */
}
/* 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;
}
}
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;
}
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, final_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;
- }
- /* if the backend has a prepare_commit op then use that, to ensure
- that all partitions are committed safely together */
for (i=0; data && data->partitions && data->partitions[i]; i++) {
- struct ldb_module *next_end = data->partitions[i]->module;
struct ldb_module *next_prepare = data->partitions[i]->module;
- struct ldb_module *next_del = data->partitions[i]->module;
+ int ret;
PARTITION_FIND_OP_NOERROR(next_prepare, prepare_commit);
if (next_prepare == NULL) {
continue;
}
- PARTITION_FIND_OP(next_end, end_transaction);
- PARTITION_FIND_OP(next_del, del_transaction);
-
- if (next_end != next_prepare || next_del != next_end) {
- ldb_asprintf_errstring(module->ldb, "ERROR: Mismatch between prepare and commit ops in ldb module");
- return LDB_ERR_OPERATIONS_ERROR;
- }
-
ret = next_prepare->ops->prepare_commit(next_prepare);
if (ret != LDB_SUCCESS) {
- /* if one fails, cancel all but this one */
- int j;
- for (j=0; data->partitions[j]; j++) {
- if (j == i) continue;
- next_del = data->partitions[j]->module;
- PARTITION_FIND_OP(next_del, del_transaction);
- next_del->ops->del_transaction(next_del);
- }
- ldb_next_del_trans(module);
return ret;
}
}
- /* Look at base DN */
- /* Figure out which partition it is under */
- /* Skip the lot if 'data' isn't here yet (initialistion) */
- final_ret = LDB_SUCCESS;
+ 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 = data->partitions[i]->module;
- PARTITION_FIND_OP(next, end_transaction);
+ struct ldb_module *next_end = data->partitions[i]->module;
+ int ret;
+
+ PARTITION_FIND_OP(next_end, end_transaction);
- ret = next->ops->end_transaction(next);
+ ret = next_end->ops->end_transaction(next_end);
if (ret != LDB_SUCCESS) {
- /* this should only be happening if we had a serious
- OS or hardware error */
- ldb_asprintf_errstring(module->ldb, "ERROR: partition commit error");
- final_ret = ret;
+ return ret;
}
}
- return final_ret;
+ 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;
}
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);
}
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,
}
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);
}
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,
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);
}
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,
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);
}
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,
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);
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;
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;
}
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);
}
}
/* 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);
}
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);
- }
-
/* forward schemaUpdateNow operation to schema_fsmo module*/
if (strcmp(req->op.extended.oid, DSDB_EXTENDED_SCHEMA_UPDATE_NOW_OID) == 0) {
return partition_extended_schema_update_now( module, req );
static int partition_sort_compare(const void *v1, const void *v2)
{
- const struct dsdb_control_current_partition *p1;
- const struct dsdb_control_current_partition *p2;
+ const struct dsdb_partition *p1;
+ const struct dsdb_partition *p2;
- p1 = *((struct dsdb_control_current_partition * const*)v1);
- p2 = *((struct dsdb_control_current_partition * const*)v2);
+ p1 = *((struct dsdb_partition * const*)v1);
+ p2 = *((struct dsdb_partition * const*)v2);
- return ldb_dn_compare(p1->dn, p2->dn);
+ return ldb_dn_compare(p1->ctrl->dn, p2->ctrl->dn);
}
static int partition_init(struct ldb_module *module)
return LDB_ERR_OPERATIONS_ERROR;
}
- ret = ldb_search(module->ldb, mem_ctx, &res,
- ldb_dn_new(mem_ctx, module->ldb, "@PARTITION"),
+ ret = ldb_search(ldb_module_get_ctx(module), mem_ctx, &res,
+ ldb_dn_new(mem_ctx, ldb_module_get_ctx(module), "@PARTITION"),
LDB_SCOPE_BASE, attrs, NULL);
if (ret != LDB_SUCCESS) {
talloc_free(mem_ctx);
partition_attributes = ldb_msg_find_element(msg, "partition");
if (!partition_attributes) {
- ldb_set_errstring(module->ldb, "partition_init: no partitions specified");
+ ldb_set_errstring(ldb_module_get_ctx(module), "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);
+ data->partitions = talloc_array(data, struct dsdb_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, ':');
+ const char *backend;
+
if (!p) {
- ldb_asprintf_errstring(module->ldb,
+ ldb_asprintf_errstring(ldb_module_get_ctx(module),
"partition_init: "
"invalid form for partition record (missing ':'): %s", base);
talloc_free(mem_ctx);
p[0] = '\0';
p++;
if (!p[0]) {
- ldb_asprintf_errstring(module->ldb,
+ ldb_asprintf_errstring(ldb_module_get_ctx(module),
"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);
+ data->partitions[i] = talloc(data->partitions, struct dsdb_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,
+ data->partitions[i]->ctrl = talloc(data->partitions[i], struct dsdb_control_current_partition);
+ if (!data->partitions[i]->ctrl) {
+ talloc_free(mem_ctx);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+ data->partitions[i]->ctrl->version = DSDB_CONTROL_CURRENT_PARTITION_VERSION;
+ data->partitions[i]->ctrl->dn = ldb_dn_new(data->partitions[i], ldb_module_get_ctx(module), base);
+ if (!data->partitions[i]->ctrl->dn) {
+ ldb_asprintf_errstring(ldb_module_get_ctx(module),
"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,
+ backend = samdb_relative_path(ldb_module_get_ctx(module),
data->partitions[i],
p);
- if (!data->partitions[i]->backend) {
- ldb_asprintf_errstring(module->ldb,
+ if (!backend) {
+ ldb_asprintf_errstring(ldb_module_get_ctx(module),
"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);
+ ret = ldb_connect_backend(ldb_module_get_ctx(module), backend, NULL, &data->partitions[i]->module);
if (ret != LDB_SUCCESS) {
talloc_free(mem_ctx);
return ret;
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");
+ ldb_debug(ldb_module_get_ctx(module), 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->op.reg_partition.dn = data->partitions[i]->ctrl->dn;
req->callback = ldb_op_default_callback;
- ldb_set_timeout(module->ldb, req, 0);
+ ldb_set_timeout(ldb_module_get_ctx(module), req, 0);
- req->handle = ldb_handle_new(req, module->ldb);
+ req->handle = ldb_handle_new(req, ldb_module_get_ctx(module));
if (req->handle == NULL) {
return LDB_ERR_OPERATIONS_ERROR;
}
- ret = ldb_request(module->ldb, req);
+ ret = ldb_request(ldb_module_get_ctx(module), 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");
+ ldb_debug(ldb_module_get_ctx(module), LDB_DEBUG_ERROR, "partition: Unable to register partition with rootdse!\n");
talloc_free(mem_ctx);
return LDB_ERR_OTHER;
}
}
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]);
+ data->replicate[i] = ldb_dn_from_ldb_val(data->replicate, ldb_module_get_ctx(module), &replicate_attributes->values[i]);
if (!ldb_dn_validate(data->replicate[i])) {
- ldb_asprintf_errstring(module->ldb,
+ ldb_asprintf_errstring(ldb_module_get_ctx(module),
"partition_init: "
"invalid DN in partition replicate record: %s",
replicate_attributes->values[i].data);
for (i=0; i < modules_attributes->num_values; i++) {
struct ldb_dn *base_dn;
int partition_idx;
- struct dsdb_control_current_partition *partition = NULL;
+ struct dsdb_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,
+ ldb_asprintf_errstring(ldb_module_get_ctx(module),
"partition_init: "
"invalid form for partition module record (missing ':'): %s", base);
talloc_free(mem_ctx);
p[0] = '\0';
p++;
if (!p[0]) {
- ldb_asprintf_errstring(module->ldb,
+ ldb_asprintf_errstring(ldb_module_get_ctx(module),
"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,
+ modules = ldb_modules_list_from_string(ldb_module_get_ctx(module), mem_ctx,
p);
- base_dn = ldb_dn_new(mem_ctx, module->ldb, base);
+ base_dn = ldb_dn_new(mem_ctx, ldb_module_get_ctx(module), 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) {
+ if (ldb_dn_compare(data->partitions[partition_idx]->ctrl->dn, base_dn) == 0) {
partition = data->partitions[partition_idx];
break;
}
}
if (!partition) {
- ldb_asprintf_errstring(module->ldb,
+ ldb_asprintf_errstring(ldb_module_get_ctx(module),
"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);
+ ret = ldb_load_modules_list(ldb_module_get_ctx(module), modules, partition->module, &partition->module);
if (ret != LDB_SUCCESS) {
- ldb_asprintf_errstring(module->ldb,
+ ldb_asprintf_errstring(ldb_module_get_ctx(module),
"partition_init: "
"loading backend for %s failed: %s",
- base, ldb_errstring(module->ldb));
+ base, ldb_errstring(ldb_module_get_ctx(module)));
talloc_free(mem_ctx);
return ret;
}
- ret = ldb_init_module_chain(module->ldb, partition->module);
+ ret = ldb_init_module_chain(ldb_module_get_ctx(module), partition->module);
if (ret != LDB_SUCCESS) {
- ldb_asprintf_errstring(module->ldb,
+ ldb_asprintf_errstring(ldb_module_get_ctx(module),
"partition_init: "
"initialising backend for %s failed: %s",
- base, ldb_errstring(module->ldb));
+ base, ldb_errstring(ldb_module_get_ctx(module)));
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,
+ ldb_debug(ldb_module_get_ctx(module), 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,
+ ldb_debug(ldb_module_get_ctx(module), LDB_DEBUG_ERROR,
"partition: Unable to register control with rootdse!\n");
return LDB_ERR_OPERATIONS_ERROR;
}
.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,
};
git.samba.org / samba.git / blobdiff