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

s4:dsdb/schema_data: make sure we only allow objects one level below the schema base

Browse Source 
The objectclass module should also check for this, but make sure
we also reject it on things like provision.

metze
This commit is contained in:
Stefan Metzmacher 2011-11-11 14:51:32 +01:00
parent 6d3558a8f6
commit 76b99bb379
1 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source4/dsdb/samdb/ldb_modules/schema_data.c
View File

@ -139,8 +139,10 @@ static int schema_data_add(struct ldb_module *module, struct ldb_request *req)
const struct ldb_val *governsID = NULL; const struct ldb_val *governsID = NULL;
const char *oid_attr = NULL; const char *oid_attr = NULL;
const char *oid = NULL; const char *oid = NULL;
struct ldb_dn *parent_dn = NULL;
int cmp;
WERROR status; WERROR status;
bool rodc; bool rodc = false;
int ret; int ret;
ldb = ldb_module_get_ctx(module); ldb = ldb_module_get_ctx(module);
@ -160,6 +162,12 @@ static int schema_data_add(struct ldb_module *module, struct ldb_request *req)
return ldb_next_request(module, req); return ldb_next_request(module, req);
} }
if (schema->base_dn == NULL) {
ldb_debug_set(ldb, LDB_DEBUG_FATAL,
"schema_data_add: base_dn NULL\n");
return LDB_ERR_OPERATIONS_ERROR;
}
ret = samdb_rodc(ldb, &rodc); ret = samdb_rodc(ldb, &rodc);
if (ret != LDB_SUCCESS) { if (ret != LDB_SUCCESS) {
DEBUG(4, (__location__ ": unable to tell if we are an RODC \n")); DEBUG(4, (__location__ ": unable to tell if we are an RODC \n"));
@ -171,6 +179,30 @@ static int schema_data_add(struct ldb_module *module, struct ldb_request *req)
return LDB_ERR_UNWILLING_TO_PERFORM; return LDB_ERR_UNWILLING_TO_PERFORM;
} }
if (ldb_request_get_control(req, LDB_CONTROL_RELAX_OID)) {
/*
* the provision code needs to create
* the schema root object.
*/
cmp = ldb_dn_compare(req->op.add.message->dn, schema->base_dn);
if (cmp == 0) {
return ldb_next_request(module, req);
}
}
parent_dn = ldb_dn_get_parent(req, req->op.add.message->dn);
if (!parent_dn) {
return ldb_oom(ldb);
}
cmp = ldb_dn_compare(parent_dn, schema->base_dn);
if (cmp != 0) {
ldb_debug_set(ldb, LDB_DEBUG_ERROR,
"schema_data_add: no direct child :%s\n",
ldb_dn_get_linearized(req->op.add.message->dn));
return LDB_ERR_UNWILLING_TO_PERFORM;
}
attributeID = ldb_msg_find_ldb_val(req->op.add.message, "attributeID"); attributeID = ldb_msg_find_ldb_val(req->op.add.message, "attributeID");
governsID = ldb_msg_find_ldb_val(req->op.add.message, "governsID"); governsID = ldb_msg_find_ldb_val(req->op.add.message, "governsID");