sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s3-classicupgrade: Fix import from ldap

Browse Source 
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
This commit is contained in:
Andrew Bartlett 2012-08-28 11:19:04 +10:00
parent dd21bb0b72
commit 9e441c4ed9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/scripting/python/samba/upgrade.py
View File

@ -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: