sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

samba-tool domain classicupgrade: Print a better error when the ldap backend PW was not found

Browse Source 
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andrew Bartlett 2013-01-15 21:53:30 +11:00
parent 68f13f5d7e
commit 669c302f2d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/samba/upgrade.py
View File

@ -598,7 +598,10 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None,
if samba3.lp.get("passdb backend").split(":")[0].strip() == "ldapsam": if samba3.lp.get("passdb backend").split(":")[0].strip() == "ldapsam":
base_dn = samba3.lp.get("ldap suffix") base_dn = samba3.lp.get("ldap suffix")
ldapuser = samba3.lp.get("ldap admin dn") ldapuser = samba3.lp.get("ldap admin dn")
ldappass = (secrets_db.get_ldap_bind_pw(ldapuser)).strip('\x00') ldappass = secrets_db.get_ldap_bind_pw(ldapuser)
if ldappass is None:
raise ProvisioningError("ldapsam passdb backend detected but no LDAP Bind PW found in secrets.tdb for user %s. Please point this tool at the secrets.tdb that was used by the previous installation.")
ldappass = ldappass.strip('\x00')
ldap = True ldap = True
else: else:
ldapuser = None ldapuser = None