python:upgrade/upgradeprovision: use dn.copy to align ldbs

[cs/samba-autobuild/.git] / source4 / scripting / bin / samba_upgradeprovision

diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision
index 47a4def003c7c16d006fccf4d2be7246eca65655..24310d2f6ccd9703a8f30277a7c4339ccdb10eda 100755 (executable)
--- a/source4/scripting/bin/samba_upgradeprovision
+++ b/source4/scripting/bin/samba_upgradeprovision
@@ -1031,7 +1031,7 @@ def update_present(ref_samdb, samdb, basedn, listPresent, usns):
                                                current, hash_attr_usn,
                                                basedn, usns, samdb)
 
-        delta.dn = dn
+        delta.dn = dn.copy(delta.ldb)
 
 
         if len(delta) >1:
@@ -1216,7 +1216,7 @@ def fix_wellknown_sd(samdb, names):
         list_wellknown_dns.append(dn)
         if dn in dnToRecalculate:
             delta = Message()
-            delta.dn = dn
+            delta.dn = dn.copy(samdb)
             descr = descriptor_fn(names.domainsid, name_map=names.name_map)
             delta["nTSecurityDescriptor"] = MessageElement(descr, FLAG_MOD_REPLACE,
                                                             "nTSecurityDescriptor" )
@@ -1250,7 +1250,7 @@ def rebuild_sd(samdb, names):
         if dn in listWellknown:
             continue
         delta = Message()
-        delta.dn = dn
+        delta.dn = dn.copy(samdb)
         sd_flags = SECINFO_OWNER | SECINFO_GROUP | SECINFO_DACL | SECINFO_SACL
         try:
             descr = get_empty_descriptor(names.domainsid)