sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r20776: require a loaded dsdb_schema for originating add and modify operations

Browse Source 
(later we'll require it for all originating changes...)

metze
(This used to be commit fc1a836ecc)
This commit is contained in:
Stefan Metzmacher 2007-01-14 18:19:26 +00:00 committed by Gerald (Jerry) Carter
parent 0de68094bf
commit 47523dbc6a
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source4/dsdb/samdb/ldb_modules/repl_meta_data.c
View File

@ -168,7 +168,9 @@ static int add_uint64_element(struct ldb_message *msg, const char *attr, uint64_
return 0;
}
static int replmd_add_originating(struct ldb_module *module, struct ldb_request *req)
static int replmd_add_originating(struct ldb_module *module,
struct ldb_request *req,
const struct dsdb_schema *schema)
{
struct ldb_request *down_req;
struct ldb_message_element *attribute;
@ -248,15 +250,25 @@ static int replmd_add_originating(struct ldb_module *module, struct ldb_request
static int replmd_add(struct ldb_module *module, struct ldb_request *req)
{
const struct dsdb_schema *schema;
/* do not manipulate our control entries */
if (ldb_dn_is_special(req->op.add.message->dn)) {
return ldb_next_request(module, req);
}
return replmd_add_originating(module, req);
schema = dsdb_get_schema(module->ldb);
if (!schema) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL, "replmd_add: no dsdb_schema loaded");
return LDB_ERR_CONSTRAINT_VIOLATION;
}
return replmd_add_originating(module, req, schema);
}
static int replmd_modify_originating(struct ldb_module *module, struct ldb_request *req)
static int replmd_modify_originating(struct ldb_module *module,
struct ldb_request *req,
const struct dsdb_schema *schema)
{
struct ldb_request *down_req;
struct ldb_message *msg;
@ -310,12 +322,20 @@ static int replmd_modify_originating(struct ldb_module *module, struct ldb_reque
static int replmd_modify(struct ldb_module *module, struct ldb_request *req)
{
const struct dsdb_schema *schema;
/* do not manipulate our control entries */
if (ldb_dn_is_special(req->op.mod.message->dn)) {
return ldb_next_request(module, req);
}
return replmd_modify_originating(module, req);
schema = dsdb_get_schema(module->ldb);
if (!schema) {
ldb_debug_set(module->ldb, LDB_DEBUG_FATAL, "replmd_modify: no dsdb_schema loaded");
return LDB_ERR_CONSTRAINT_VIOLATION;
}
return replmd_modify_originating(module, req, schema);
}
static int replmd_replicated_request_reply_helper(struct replmd_replicated_request *ar, int ret)
@ -553,8 +573,8 @@ static int replmd_replicated_apply_merge(struct replmd_replicated_request *ar)
* TODO: add rename conflict handling
*/
if (ldb_dn_compare(msg->dn, ar->sub.search_msg->dn) != 0) {
ldb_debug(ar->module->ldb, LDB_DEBUG_FATAL, "replmd_replicated_apply_merge[%u]: rename not supported",
ar->index_current);
ldb_debug_set(ar->module->ldb, LDB_DEBUG_FATAL, "replmd_replicated_apply_merge[%u]: rename not supported",
ar->index_current);
ldb_debug(ar->module->ldb, LDB_DEBUG_FATAL, "%s => %s\n",
ldb_dn_get_linearized(ar->sub.search_msg->dn),
ldb_dn_get_linearized(msg->dn));