Attachment 15480 Details for Bug 14136 – 0001-classicupgrade-fix-a-a-bytes-like-object-is-required.patch

[patch] 0001-classicupgrade-fix-a-a-bytes-like-object-is-required.patch

0001-classicupgrade-fix-a-a-bytes-like-object-is-required.patch (text/plain), 1.14 KB, created by Björn Jacke on 2019-09-21 11:58:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Jacke

Created: 2019-09-21 11:58:47 UTC

Size: 1.14 KB

patch

obsolete

>From 88c424b613d428bc47b469184265edee1b574be6 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bjacke@samba.org>
>Date: Sat, 21 Sep 2019 13:24:59 +0200
>Subject: [PATCH] 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>
>---
> python/samba/upgrade.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py
>index 12555b7994eb..8511bed28680 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
>-- 
>2.17.1
>

Actions: View

Attachments on bug 14136: 15480 | 15483