[PATCH 6/8] s4:upgradeprovision Use mkdtemp to create unique tempoary directory names

[Andrew Bartlett]

---
 source4/scripting/bin/upgradeprovision |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index 7ac8bcb..f8f1924 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -30,6 +30,7 @@ import random
 import string
 import re
 import base64
+import tempfile
 # Find right directory when running from source tree
 sys.path.insert(0, "bin/python")
 
@@ -266,7 +267,7 @@ def print_names(names):
 # since the latest upgrade in the current provision
 def newprovision(names,setup_dir,creds,session,smbconf):
 	message(SIMPLE, "Creating a reference provision")
-	provdir=os.path.join(paths.private_dir,"referenceprovision")
+	provdir=tempfile.mkdtemp(dir=paths.private_dir, prefix="referenceprovision")
 	if os.path.isdir(provdir):
 		rmall(provdir)
 	logstd=os.path.join(provdir,"log.std")
@@ -746,10 +747,10 @@ populate_backlink(newpaths,creds,session,names.schemadn)
 update_basesamdb(newpaths,paths,names)
 update_secrets(newpaths,paths,creds,session)
 update_privilege(newpaths,paths)
+update_machine_account_password(newpaths,paths,creds,session,names)
 
 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="0002-s4-ldb-Provide-bindings-for-ldb_transaction_prepare_.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0002-s4-ldb-Provide-bindings-for-ldb_transaction_prepare_.pa";
 filename*1="tch"