diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-03-28 21:57:15 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-03-28 21:57:15 +1100 |
| commit | 142fbfb3c1f9f8cda7f0edaa801f8345f23d805f (patch) | |
| tree | 8471bcd9a25ee25f7323fe4af7b8fb70ac31b211 /source4/setup/upgrade.py | |
| parent | 8f8c56bfbcbfe8f80afb09eb1d481a108b252bee (diff) | |
| download | samba-142fbfb3c1f9f8cda7f0edaa801f8345f23d805f.tar.gz samba-142fbfb3c1f9f8cda7f0edaa801f8345f23d805f.tar.bz2 samba-142fbfb3c1f9f8cda7f0edaa801f8345f23d805f.zip | |
Fix and test python scripts and kerberos
This fixes up the python credentials interface in a number of areas,
with the aim of supporting '-k yes' as a command line option. (This
enables the use of kerberos).
As such, I've had to change the get_credentials call to take a
loadparm context, so that the credentials can be initialised
correctly.
The test_kinit script has been modified to prove that this continues
to work, as well as to provide greater code coverage of the kerberos
paths.
Andrew Bartlett
(This used to be commit 727ef40c2b56910028ef3c1092b8eab1bfa6ce63)
Diffstat (limited to 'source4/setup/upgrade.py')
| -rwxr-xr-x | source4/setup/upgrade.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/setup/upgrade.py b/source4/setup/upgrade.py index 569b179544..3bcc57ab64 100755 --- 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" -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(), - smbconf=sambaopts.get_loadparm_path(), targetdir=opts.targetdir) + smbconf=smbconf, targetdir=opts.targetdir) |