From 5d15f28fc11412ef736ff30c401fe034c7b34115 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 4 Feb 2011 11:05:40 +1100 Subject: s4-upgradeprovision: renames need a relax to avoid subtree_rename checks --- source4/scripting/python/samba/upgradehelpers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source4/scripting/python') diff --git a/source4/scripting/python/samba/upgradehelpers.py b/source4/scripting/python/samba/upgradehelpers.py index a10c6d39da..5bd341cedc 100755 --- a/source4/scripting/python/samba/upgradehelpers.py +++ b/source4/scripting/python/samba/upgradehelpers.py @@ -421,8 +421,9 @@ def identic_rename(ldbobj, dn): :param dn: DN of the object to manipulate """ (before, after) = str(dn).split('=', 1) - ldbobj.rename(dn, ldb.Dn(ldbobj, "%s=foo%s" % (before, after))) - ldbobj.rename(ldb.Dn(ldbobj, "%s=foo%s" % (before, after)), dn) + # we need to use relax to avoid the subtree_rename constraints + ldbobj.rename(dn, ldb.Dn(ldbobj, "%s=foo%s" % (before, after)), ["relax:0"]) + ldbobj.rename(ldb.Dn(ldbobj, "%s=foo%s" % (before, after)), dn, ["relax:0"]) def chunck_acl(acl): -- cgit