summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2011-06-21 13:37:26 +0400
committerMatthieu Patou <mat@samba.org>2011-06-22 20:13:08 +0200
commitc2dfaa2580918cf31069c1063ff07a819ca0554a (patch)
tree1c560c6d169b759e7ce77c4b7ad4b7f6eb3f1128
parent2f4251c389f5fa92bfba10739677a760f0bdf198 (diff)
downloadsamba-c2dfaa2580918cf31069c1063ff07a819ca0554a.tar.gz
samba-c2dfaa2580918cf31069c1063ff07a819ca0554a.tar.xz
samba-c2dfaa2580918cf31069c1063ff07a819ca0554a.zip
s4-upgradeprovision: Don't forget to populate the non replicated objects, and don't touch rIDPreviousAllocationPool
-rwxr-xr-xsource4/scripting/bin/upgradeprovision6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index f10a9fcc9c4..e98b6427762 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -93,7 +93,7 @@ replAttrNotCopied = [ "dn", "whenCreated", "whenChanged", "objectGUID",
"sAMAccountType", "oEMInformation", "creationTime" ]
nonreplAttrNotCopied = ["uSNCreated", "replPropertyMetaData", "uSNChanged",
- "nextRid" ,"rIDNextRID"]
+ "nextRid" ,"rIDNextRID", "rIDPreviousAllocationPool"]
nonDSDBAttrNotCopied = ["msDS-KeyVersionNumber", "priorSecret", "priorWhenChanged"]
@@ -266,7 +266,8 @@ def populateNotReplicated(samdb, schemadn):
str(schemadn)), scope=SCOPE_SUBTREE,
attrs=["lDAPDisplayName"])
for elem in res:
- not_replicated.append(elem["lDAPDisplayName"])
+ not_replicated.append(str(elem["lDAPDisplayName"]))
+
def populate_dnsyntax(samdb, schemadn):
"""Populate an array with all the attributes that have DN synthax
@@ -1778,6 +1779,7 @@ if __name__ == '__main__':
new_ldbs = get_ldbs(newpaths, creds, session, lp)
new_ldbs.startTransactions()
+ populateNotReplicated(new_ldbs.sam, names.schemadn)
# 8) Populate some associative array to ease the update process
# List of attribute which are link and backlink
populate_links(new_ldbs.sam, names.schemadn)