diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-10-06 14:21:02 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-10-06 14:34:22 +1100 |
| commit | d7f617e2e180eab6decb18e697f1e1294194a2cb (patch) | |
| tree | 664a1543c6f86cadfff013b1d4c977278805f0e0 /source4/dsdb/samdb | |
| parent | c2d70af1a7b0a67283837a9f823158fd7f8db574 (diff) | |
| download | samba-d7f617e2e180eab6decb18e697f1e1294194a2cb.tar.gz samba-d7f617e2e180eab6decb18e697f1e1294194a2cb.tar.bz2 samba-d7f617e2e180eab6decb18e697f1e1294194a2cb.zip | |
s4-dsdb: allow deletion of backlinks if DSDB_CONTROL_DBCHECK given
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/dsdb/samdb')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/objectclass_attrs.c | 3 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c index 9893adae93..b6f91651dc 100644 --- a/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c +++ b/source4/dsdb/samdb/ldb_modules/objectclass_attrs.c @@ -173,7 +173,8 @@ static int attr_handler(struct oc_context *ac) } if ((attr->linkID & 1) == 1 && - !ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID)) { + !ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID) && + !ldb_request_get_control(ac->req, DSDB_CONTROL_DBCHECK)) { /* Odd is for the target. Illegal to modify */ ldb_asprintf_errstring(ldb, "objectclass_attrs: attribute '%s' on entry '%s' must not be modified directly, it is a linked attribute", diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index fff542abca..2be0760d14 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -2179,6 +2179,9 @@ static int replmd_modify_handle_linked_attribs(struct ldb_module *module, continue; } if ((schema_attr->linkID & 1) == 1) { + if (parent && ldb_request_get_control(parent, DSDB_CONTROL_DBCHECK)) { + continue; + } /* Odd is for the target. Illegal to modify */ ldb_asprintf_errstring(ldb, "attribute %s must not be modified directly, it is a linked attribute", el->name); |