[PATCH 3/8] s4:upgradeprovision Rework script, and reset machine account pw

[Andrew Bartlett]

The rework corrects some duplication and errors in the original
script, found when preparing an automated test of the script.

The code to reset the machine account password avoids issues with AES
keys and salting, which may not otherwise be solved by the upgrade.

Andrew Bartlett
---
 source4/scripting/bin/upgradeprovision |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index 40fe57c..2051a64 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -45,9 +45,11 @@ import samba.getopt as options
 from samba.samdb import SamDB
 from samba import param
 from samba.provision import  ProvisionNames,provision_paths_from_lp,find_setup_dir,FILL_FULL,provision, get_domain_descriptor, get_config_descriptor
+from samba.provisionexceptions import ProvisioningError
 from samba.schema import get_dnsyntax_attributes, get_linked_attributes, Schema, get_schema_descriptor
 from samba.dcerpc import misc, security
 from samba.ndr import ndr_pack, ndr_unpack
+from samba.dcerpc.misc import SEC_CHAN_BDC
 
 replace=2^ldb.FLAG_MOD_REPLACE
 add=2^ldb.FLAG_MOD_ADD
@@ -719,6 +721,7 @@ update_privilege(newpaths,paths)
 
 if opts.full:
 	update_samdb(newpaths,paths,creds,session,names)
+	update_machine_account_password(newpaths,paths,creds,session,names)
 update_sd(newpaths,paths,creds,session,names)
 check_updated_sd(newpaths,paths,creds,session,names)
 message(SIMPLE,"Upgrade finished !")
-- 
1.6.3.3


--------------040904030402080707020200
Content-Type: text/x-patch;
 name="0004-s4-selftest-Add-tests-for-upgradeprovision.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0004-s4-selftest-Add-tests-for-upgradeprovision.patch"