diff options
| author | Matthieu Patou <mat@matws.net> | 2010-02-23 16:45:51 +0300 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-03-01 03:20:36 +0100 |
| commit | 5054bdb4f2008216f4591be9064002c3750474e4 (patch) | |
| tree | 0ee89a8dd8b1061901a5286ff5ad44840270a25d /source4/scripting/python | |
| parent | 3bd16415d29d074c7a8f9bf949a35b7e8f8b61a2 (diff) | |
| download | samba-5054bdb4f2008216f4591be9064002c3750474e4.tar.gz samba-5054bdb4f2008216f4591be9064002c3750474e4.tar.bz2 samba-5054bdb4f2008216f4591be9064002c3750474e4.zip | |
upgradeprovision: code cleanup
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Diffstat (limited to 'source4/scripting/python')
| -rwxr-xr-x | source4/scripting/python/samba/upgradehelpers.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source4/scripting/python/samba/upgradehelpers.py b/source4/scripting/python/samba/upgradehelpers.py index 58da4dbb6d..f4560601b4 100755 --- a/source4/scripting/python/samba/upgradehelpers.py +++ b/source4/scripting/python/samba/upgradehelpers.py @@ -62,6 +62,7 @@ def find_provision_key_parameters(param,credentials,session_info,paths,smbconf): lp = param.LoadParm() lp.load(paths.smbconf) names = ProvisionNames() + names.adminpass = None # NT domain, kerberos realm, root dn, domain dn, domain dns name names.domain = string.upper(lp.get("workgroup")) names.realm = lp.get("realm") @@ -149,18 +150,18 @@ def newprovision(names,setup_dir,creds,session,smbconf,provdir,messagefunc): logstd=os.path.join(provdir,"log.std") os.chdir(os.path.join(setup_dir,"..")) os.mkdir(provdir) - os.close(2) - sys.stderr = open("%s/provision.log"%provdir, "w") - messagefunc("Reference provision stored in %s"%provdir) - messagefunc("STDERR message of provision will be logged in %s/provision.log"%provdir) - sys.stderr = open("/dev/stdout", "w") + #os.close(2) + #sys.stderr = open("%s/provision.log"%provdir, "w") + messagefunc("Provision stored in %s"%provdir) + #messagefunc("STDERR message of provision will be logged in %s/provision.log"%provdir) + #sys.stderr = open("/dev/stdout", "w") provision(setup_dir, messagefunc, session, creds, smbconf=smbconf, targetdir=provdir, samdb_fill=FILL_FULL, realm=names.realm, domain=names.domain, domainguid=names.domainguid, domainsid=str(names.domainsid),ntdsguid=names.ntdsguid, policyguid=names.policyid,policyguid_dc=names.policyid_dc,hostname=names.netbiosname, hostip=None, hostip6=None, - invocationid=names.invocation, adminpass=None, + invocationid=names.invocation, adminpass=names.adminpass, krbtgtpass=None, machinepass=None, dnspass=None, root=None, nobody=None, wheel=None, users=None, |