[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  fb274f0... s4:subtree_rename.c - relax the checks when requested
      from  887b730... s4-test: Add drs.rpc.msDSIntId test to knownfail tests

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fb274f056b85b56fec773c05329c41b72e0f7715
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Sun Aug 15 09:24:22 2010 +0200

    s4:subtree_rename.c - relax the checks when requested
    
    (Needed by upgradeprovision for example)

-----------------------------------------------------------------------

Summary of changes:
 source4/dsdb/samdb/ldb_modules/subtree_rename.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/subtree_rename.c b/source4/dsdb/samdb/ldb_modules/subtree_rename.c
index ef27eca..3f03050 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 */
 


-- 
Samba Shared Repository