diff options
| author | Matthieu Patou <mat@matws.net> | 2010-08-10 17:39:29 +0400 |
|---|---|---|
| committer | Matthieu Patou <mat@matws.net> | 2010-08-19 15:59:04 +0400 |
| commit | 503824b75723f62bbe7ee578d0ed6ad4a1203665 (patch) | |
| tree | e78e2dcc079a8e6f87da2b05fb1f365eed3cda33 | |
| parent | f6ac919a91663a97fbc27fb8430c73e13bf03a55 (diff) | |
| download | samba-503824b75723f62bbe7ee578d0ed6ad4a1203665.tar.gz samba-503824b75723f62bbe7ee578d0ed6ad4a1203665.tar.bz2 samba-503824b75723f62bbe7ee578d0ed6ad4a1203665.zip | |
s4 upgradeprovision: fix a typo and pass correct parameter to increment_calculated_keyversion
| -rwxr-xr-x | source4/scripting/bin/upgradeprovision | 7 | ||||
| -rwxr-xr-x | source4/scripting/python/samba/upgradehelpers.py | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index 23c511f081..f171aebe58 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -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) diff --git a/source4/scripting/python/samba/upgradehelpers.py b/source4/scripting/python/samba/upgradehelpers.py index 58106e0a70..2bc1795fbc 100755 --- a/source4/scripting/python/samba/upgradehelpers.py +++ b/source4/scripting/python/samba/upgradehelpers.py @@ -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) |