Fix and test python scripts and kerberos

[ab/samba.git/.git] / source4 / setup / upgrade.py

diff --git a/source4/setup/upgrade.py b/source4/setup/upgrade.py
index 569b1795442f0ef3386f51269011351c864e6cdc..3bcc57ab64770169ca7d13b7fd2ee5a8259d1cf4 100755 (executable)
--- a/source4/setup/upgrade.py
+++ b/source4/setup/upgrade.py
@@ -57,7 +57,9 @@ setup_dir = opts.setupdir
 if setup_dir is None:
        setup_dir = "setup"
 
 if setup_dir is None:
        setup_dir = "setup"
 

-creds = credopts.get_credentials()
+lp = sambaopts.get_loadparm()
+smbconf = lp.configfile()
+creds = credopts.get_credentials(lp)

 
 upgrade_provision(samba3, setup_dir, message, credentials=creds, session_info=system_session(), 
 
 upgrade_provision(samba3, setup_dir, message, credentials=creds, session_info=system_session(), 

-                  smbconf=sambaopts.get_loadparm_path(), targetdir=opts.targetdir)
+                  smbconf=smbconf, targetdir=opts.targetdir)