sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

s4:objectclass LDB module - weak the check for the "rIDSet" delete constraint

Browse Source 
Perform it only when a "rIDSet" does exist. Requested by ekacnet for
"upgradeprovision".
This commit is contained in:
Matthias Dieter Wallnöfer 2010-08-10 21:01:11 +02:00
parent 303089f5b8
commit 067b5721c7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source4/dsdb/samdb/ldb_modules/objectclass.c
View File

@ -1366,20 +1366,22 @@ static int objectclass_do_delete(struct oc_context *ac)
}
/* DC's rIDSet object */
/* Perform this check only when it does exist - this is needed in order
* to don't let existing provisions break. */
ret = samdb_rid_set_dn(ldb, ac, &dn);
if (ret != LDB_SUCCESS) {
if ((ret != LDB_SUCCESS) && (ret != LDB_ERR_NO_SUCH_OBJECT)) {
return ret;
}
if (ldb_dn_compare(ac->req->op.del.dn, dn) == 0) {
if (ret == LDB_SUCCESS) {
if (ldb_dn_compare(ac->req->op.del.dn, dn) == 0) {
talloc_free(dn);
ldb_asprintf_errstring(ldb, "objectclass: Cannot delete %s, it's the DC's rIDSet object!",
ldb_dn_get_linearized(ac->req->op.del.dn));
return LDB_ERR_UNWILLING_TO_PERFORM;
}
talloc_free(dn);
ldb_asprintf_errstring(ldb, "objectclass: Cannot delete %s, it's the DC's rIDSet object!",
ldb_dn_get_linearized(ac->req->op.del.dn));
return LDB_ERR_UNWILLING_TO_PERFORM;
}
talloc_free(dn);
/* crossRef objects regarding config, schema and default domain NCs */
if (samdb_find_attribute(ldb, ac->search_res->message, "objectClass",
"crossRef") != NULL) {