sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00
Code Activity

s4 upgradeprovision: Synchronize the calculated keyversionnumber with the one previously stored

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Matthieu Patou
2010-07-05 01:00:13 +04:00
committed by Andrew Bartlett
parent 0a1b1121c4
commit 7478224189
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source4/scripting/bin/upgradeprovision
View File

@ -56,7 +56,9 @@ from samba.upgradehelpers import (dn_sort, get_paths, newprovision,
CHANGEALL, GUESS, CHANGESD, PROVISION,
updateOEMInfo, getOEMInfo, update_gpo,
delta_update_basesamdb, update_policyids,
update_machine_account_password)
update_machine_account_password,
search_constructed_attrs_stored,
increment_calculated_keyversion_number)
replace=2**FLAG_MOD_REPLACE
add=2**FLAG_MOD_ADD
@ -1299,6 +1301,23 @@ def backup_provision(paths, dir):
else:
shutil.copytree(samldbdir, os.path.join(dir, "sam.ldb.d"))
def sync_calculated_attributes(samdb, names):
"""Synchronize attributes used for constructed ones, with the
old constructed that were stored in the database.
This apply for instance to msds-keyversionnumber that was
stored and that is now constructed from replpropertymetadata.
:param samdb: An LDB object attached to the currently upgraded samdb
:param names: Various key parameter about current provision.
"""
listAttrs = ["msDs-KeyVersionAttribute"]
hash = search_constructed_attrs_stored(samdb, names.rootdn, listAttrs)
increment_calculated_keyversion_number(samdb, names.rootdn, hash)
def setup_path(file):
return os.path.join(setup_dir, file)
@ -1546,6 +1565,8 @@ if __name__ == '__main__':
new_ldbs.groupedRollback()
shutil.rmtree(provisiondir)
sys.exit(1)
else:
sync_calculated_attributes(ldbs.sam, names)
# 14)
update_secrets(new_ldbs.secrets, ldbs.secrets, message)
# 15)