diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-28 11:19:04 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-28 09:49:39 +0200 |
| commit | 9e441c4ed98b1a2b83069ad5fa54b2b30dc75598 (patch) | |
| tree | 2e448d88f07b634df03aeba33b2c992f4559b4e7 | |
| parent | dd21bb0b728a9c6dfc70f1785a642474fe7bd78b (diff) | |
| download | samba-9e441c4ed98b1a2b83069ad5fa54b2b30dc75598.tar.gz samba-9e441c4ed98b1a2b83069ad5fa54b2b30dc75598.tar.bz2 samba-9e441c4ed98b1a2b83069ad5fa54b2b30dc75598.zip | |
s3-classicupgrade: Fix import from ldap
We must not reference result before provision(), and do not need
session_info and lp for reading a normal ldap backend anyway.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Aug 28 09:49:39 CEST 2012 on sn-devel-104
| -rw-r--r-- | source4/scripting/python/samba/upgrade.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index 19a42c786a..d3f0b8de16 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -775,13 +775,13 @@ Please fix this account before attempting to upgrade again pgids = {} if ldap: creds = Credentials() - creds.guess(s3param.get_context()) + creds.guess(samba3.lp) creds.set_bind_dn(ldapuser) creds.set_password(ldappass) urls = samba3.lp.get("passdb backend").split(":",1)[1].strip('"') for url in urls.split(): try: - ldb_object = Ldb(url, session_info=system_session(result.lp), credentials=creds, lp=result.lp) + ldb_object = Ldb(url, credentials=creds) except ldb.LdbError, e: logger.warning("Could not open ldb connection to %s, the error message is: %s", url, e) else: |