summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-08-01 11:06:18 +0200
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-08-01 14:00:10 +0200
commit7ea1796fa44335858360031b778c5867b1c4c3fe (patch)
tree1019d24e3c7bd85fbfd01d08392676ed78942284 /source4/dsdb
parent2e66033ab93ed036289892bd3718839472b3f27f (diff)
downloadsamba-7ea1796fa44335858360031b778c5867b1c4c3fe.tar.gz
samba-7ea1796fa44335858360031b778c5867b1c4c3fe.tar.bz2
samba-7ea1796fa44335858360031b778c5867b1c4c3fe.zip
s4:subtree_rename LDB module - rename "check_system_flags" into "check_constraints" and perform more checks
Always considering MS-ADTS 3.1.1.5.4.1.2.
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/samdb/ldb_modules/subtree_rename.c52
1 files changed, 43 insertions, 9 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/subtree_rename.c b/source4/dsdb/samdb/ldb_modules/subtree_rename.c
index 094a9c6442..ef27eca395 100644
--- a/source4/dsdb/samdb/ldb_modules/subtree_rename.c
+++ b/source4/dsdb/samdb/ldb_modules/subtree_rename.c
@@ -141,9 +141,9 @@ static int subtree_rename_next_request(struct subtree_rename_context *ac)
return ldb_next_request(ac->module, req);
}
-static int check_system_flags(struct ldb_message *msg,
- struct subtree_rename_context *ac,
- struct ldb_dn *olddn, struct ldb_dn *newdn)
+static int check_constraints(struct ldb_message *msg,
+ struct subtree_rename_context *ac,
+ struct ldb_dn *olddn, struct ldb_dn *newdn)
{
struct ldb_context *ldb = ldb_module_get_ctx(ac->module);
struct ldb_dn *dn1, *dn2;
@@ -155,6 +155,39 @@ static int check_system_flags(struct ldb_message *msg,
return LDB_SUCCESS;
}
+ /* Objects under CN=System */
+
+ dn1 = ldb_dn_copy(ac, ldb_get_default_basedn(ldb));
+ if (dn1 == NULL) return ldb_oom(ldb);
+
+ if ( ! ldb_dn_add_child_fmt(dn1, "CN=System")) {
+ talloc_free(dn1);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
+ if ((ldb_dn_compare_base(dn1, olddn) == 0) &&
+ (ldb_dn_compare_base(dn1, newdn) != 0)) {
+ talloc_free(dn1);
+ ldb_asprintf_errstring(ldb,
+ "subtree_rename: Cannot move/rename %s. Objects under CN=System have to stay under it!",
+ ldb_dn_get_linearized(olddn));
+ return LDB_ERR_OTHER;
+ }
+
+ talloc_free(dn1);
+
+ /* LSA objects */
+
+ if ((samdb_find_attribute(ldb, msg, "objectClass", "secret") != NULL) ||
+ (samdb_find_attribute(ldb, msg, "objectClass", "trustedDomain") != NULL)) {
+ ldb_asprintf_errstring(ldb,
+ "subtree_rename: Cannot move/rename %s. It's an LSA-specific object!",
+ ldb_dn_get_linearized(olddn));
+ return LDB_ERR_UNWILLING_TO_PERFORM;
+ }
+
+ /* systemFlags */
+
dn1 = ldb_dn_get_parent(ac, olddn);
if (dn1 == NULL) return ldb_oom(ldb);
dn2 = ldb_dn_get_parent(ac, newdn);
@@ -273,9 +306,9 @@ static int subtree_rename_search_callback(struct ldb_request *req,
/* this was already stored by the
* subtree_rename_search() */
- ret = check_system_flags(ares->message, ac,
- ac->list->olddn,
- ac->list->newdn);
+ ret = check_constraints(ares->message, ac,
+ ac->list->olddn,
+ ac->list->newdn);
if (ret != LDB_SUCCESS) {
return ldb_module_done(ac->req, NULL, NULL,
ret);
@@ -308,8 +341,8 @@ static int subtree_rename_search_callback(struct ldb_request *req,
LDB_ERR_OPERATIONS_ERROR);
}
- ret = check_system_flags(ares->message, ac,
- store->olddn, store->newdn);
+ ret = check_constraints(ares->message, ac,
+ store->olddn, store->newdn);
if (ret != LDB_SUCCESS) {
return ldb_module_done(ac->req, NULL, NULL, ret);
}
@@ -342,7 +375,8 @@ static int subtree_rename_search_callback(struct ldb_request *req,
static int subtree_rename(struct ldb_module *module, struct ldb_request *req)
{
struct ldb_context *ldb;
- static const char * const attrs[] = { "systemFlags", NULL };
+ static const char * const attrs[] = { "objectClass", "systemFlags",
+ NULL };
struct ldb_request *search_req;
struct subtree_rename_context *ac;
int ret;