From 9e441c4ed98b1a2b83069ad5fa54b2b30dc75598 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 28 Aug 2012 11:19:04 +1000 Subject: 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 Autobuild-Date(master): Tue Aug 28 09:49:39 CEST 2012 on sn-devel-104 --- source4/scripting/python/samba/upgrade.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/scripting') 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: -- cgit