diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-27 16:56:35 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-28 07:57:29 +1000 |
| commit | 738f4ac058ab49239271539fe66d09bfa81a138b (patch) | |
| tree | 9b6199ec2bb565ae7d7edffb86cfe3a4d2436573 | |
| parent | 1ed607057087cd5e9f1deebe472a1a6d9009a32f (diff) | |
| download | samba-738f4ac058ab49239271539fe66d09bfa81a138b.tar.gz samba-738f4ac058ab49239271539fe66d09bfa81a138b.tar.bz2 samba-738f4ac058ab49239271539fe66d09bfa81a138b.zip | |
s4-classicupgrade: Use s3param.get_context() instead of result.lp
We should not need the guessed values here, but by changing to using the s3 loadparm context
we can move this block to before the provision.
Andrew Bartlett
| -rw-r--r-- | source4/scripting/python/samba/upgrade.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index f363a9c02d..32d8326cf9 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -810,7 +810,7 @@ Please fix this account before attempting to upgrade again pgids = {} if ldap: creds = Credentials() - creds.guess(result.lp) + creds.guess(s3param.get_context()) creds.set_bind_dn(ldapuser) creds.set_password(ldappass) urls = samba3.lp.get("passdb backend").split(":",1)[1].strip('"') |