diff options
| author | Björn Jacke <bj@sernet.de> | 2019-09-21 13:24:59 +0200 |
|---|---|---|
| committer | Bjoern Jacke <bjacke@samba.org> | 2019-09-23 12:58:20 +0000 |
| commit | 465e518d6cc200eefa38643e720ce64e53abac2e (patch) | |
| tree | 1c382a5181a4961fc247a063136d031e07e54f2a /python | |
| parent | ec4c5975528f3d3ab9c8813e176c6d1a2f1ca506 (diff) | |
| download | samba-465e518d6cc200eefa38643e720ce64e53abac2e.tar.gz | |
classicupgrade: fix a a bytes-like object is required, not 'str' error
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14136
Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Reviewed-by: Björn Baumbach <bb@samba.org>
Autobuild-User(master): Björn Jacke <bjacke@samba.org>
Autobuild-Date(master): Mon Sep 23 12:58:20 UTC 2019 on sn-devel-184
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/upgrade.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py index 12555b7994e..8511bed2868 100644 --- a/python/samba/upgrade.py +++ b/python/samba/upgrade.py @@ -474,7 +474,7 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None, 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') + ldappass = ldappass.decode('utf-8').strip('\x00') ldap = True else: ldapuser = None |