sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

s4 upgradeprovision: fix a typo and pass correct parameter to increment_calculated_keyversion

Browse Source
This commit is contained in:
Matthieu Patou 2010-08-10 17:39:29 +04:00
parent f6ac919a91
commit 503824b757
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source4/scripting/bin/upgradeprovision
View File

@ -1335,9 +1335,10 @@ def sync_calculated_attributes(samdb, names):
:param samdb: An LDB object attached to the currently upgraded samdb
:param names: Various key parameter about current provision.
"""
listAttrs = ["msDs-KeyVersionAttribute"]
listAttrs = ["msDs-KeyVersionNumber"]
hash = search_constructed_attrs_stored(samdb, names.rootdn, listAttrs)
increment_calculated_keyversion_number(samdb, names.rootdn, hash)
increment_calculated_keyversion_number(samdb, names.rootdn,
hash["msDs-KeyVersionNumber"])
def setup_path(file):
return os.path.join(setup_dir, file)
@ -1658,6 +1659,6 @@ if __name__ == '__main__':
except StandardError, err:
message(ERROR,"A problem has occured when trying to upgrade your provision,"
" a full backup is located at %s" % backupdir)
if opts.changeall:
if opts.debugall or opts.debugchange:
(typ, val, tb) = sys.exc_info()
traceback.print_exception(typ, val, tb)

2
source4/scripting/python/samba/upgradehelpers.py
View File

@ -737,12 +737,12 @@ def increment_calculated_keyversion_number(samdb, rootdn, hashDns):
else:
for e in entry:
if hashDns.has_key(str(e.dn).lower()):
done = done + 1
val = e.get("msDs-KeyVersionNumber")
if not val:
continue
version = int(str(hashDns[str(e.dn).lower()]))
if int(str(val)) < version:
done = done + 1
samdb.set_attribute_replmetadata_version(str(e.dn),
"unicodePwd",
version)