Attachment 15483 Details for Bug 14136 – cherry picked patch for 4.10 and 4.11

[patch] cherry picked patch for 4.10 and 4.11

0001-classicupgrade-fix-a-a-bytes-like-object-is-required.patch (text/plain), 1.46 KB, created by Björn Jacke on 2019-09-23 13:15:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Jacke

Created: 2019-09-23 13:15:49 UTC

Size: 1.46 KB

patch

obsolete

>From fdcc860a1382945885a7b795cef4da930a3309b6 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
>Date: Sat, 21 Sep 2019 13:24:59 +0200
>Subject: [PATCH 1/2] classicupgrade: fix a a bytes-like object is required,
> not 'str' error
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>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
>
>(cherry picked from commit 465e518d6cc200eefa38643e720ce64e53abac2e)
>---
> 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
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 14136: 15480 | 15483