summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
Diffstat (limited to 'source4/scripting')
-rwxr-xr-xsource4/scripting/bin/upgradeprovision9
1 files changed, 7 insertions, 2 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index ae84c9586b..e231d08477 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -140,6 +140,12 @@ if setup_dir is None:
session = system_session()
+# simple helper to allow back and forth rename
+def identic_rename(ldb,dn):
+ (before,sep,after)=str(dn).partition('=')
+ ldb.rename(dn,ldb.Dn(ldb,"%s=foo%s"%(before,after)))
+ ldb.rename(ldb.Dn(ldb,"%s=foo%s"%(before,after)),dn)
+
# Create an array of backlinked attributes
def populate_backlink(newpaths,creds,session,schemadn):
newsam_ldb = Ldb(newpaths.samdb, session_info=session, credentials=creds,lp=lp)
@@ -458,8 +464,7 @@ def update_secrets(newpaths,paths,creds,session):
if att == "name":
message(CHANGE,"Found attribute name on %s, must rename the DN "%(res2[0].dn))
- secrets_ldb.rename(res2[0].dn,ldb.Dn(secrets_ldb,"%sfoo"%str(res2[0].dn)))
- secrets_ldb.rename(ldb.Dn(secrets_ldb,"%sfoo"%str(res2[0].dn)),res2[0].dn)
+ identic_rename(secrets_ldb,res[0].dn)
else:
delta.remove(att)