diff options
| -rw-r--r-- | python/samba/upgrade.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py index d680a7ca23..e013d2c831 100644 --- a/python/samba/upgrade.py +++ b/python/samba/upgrade.py @@ -598,7 +598,10 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None, if samba3.lp.get("passdb backend").split(":")[0].strip() == "ldapsam": base_dn = samba3.lp.get("ldap suffix") 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 else: ldapuser = None |