summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-08-15 09:24:22 +0200
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-08-15 09:24:22 +0200
commitfb274f056b85b56fec773c05329c41b72e0f7715 (patch)
tree93564728eef2427faf81b6c5f3c76fcc787f4a33
parent887b7306a779509d9929d18d0ca91b17d510fd5b (diff)
downloadsamba-fb274f056b85b56fec773c05329c41b72e0f7715.tar.gz
samba-fb274f056b85b56fec773c05329c41b72e0f7715.tar.bz2
samba-fb274f056b85b56fec773c05329c41b72e0f7715.zip
s4:subtree_rename.c - relax the checks when requested
(Needed by upgradeprovision for example)
-rw-r--r--source4/dsdb/samdb/ldb_modules/subtree_rename.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/subtree_rename.c b/source4/dsdb/samdb/ldb_modules/subtree_rename.c
index ef27eca395..3f030509b0 100644
--- a/source4/dsdb/samdb/ldb_modules/subtree_rename.c
+++ b/source4/dsdb/samdb/ldb_modules/subtree_rename.c
@@ -151,9 +151,14 @@ static int check_constraints(struct ldb_message *msg,
bool move_op = false;
bool rename_op = false;
+ /* Skip the checks if old and new DN are the same or if we relax */
+
if (ldb_dn_compare(olddn, newdn) == 0) {
return LDB_SUCCESS;
}
+ if (ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID) != NULL) {
+ return LDB_SUCCESS;
+ }
/* Objects under CN=System */