[SCM] Samba Shared Repository - branch v4-10-test updated

[Karolin Seeger]

The branch, v4-10-test has been updated
       via  eaecffd63db classicupgrade: fix a a bytes-like object is required, not 'str' error
      from  1b4ccd961f1 ctdb-tools: Stop deleted nodes from influencing ctdb nodestatus exit code

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-10-test


- Log -----------------------------------------------------------------
commit eaecffd63db8b5f0d8072d645862b518f658074b
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Sep 21 13:24:59 2019 +0200

    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 at samba.org>
    Reviewed-by: Björn Baumbach <bb at samba.org>
    
    Autobuild-User(master): Björn Jacke <bjacke at samba.org>
    Autobuild-Date(master): Mon Sep 23 12:58:20 UTC 2019 on sn-devel-184
    
    (cherry picked from commit 465e518d6cc200eefa38643e720ce64e53abac2e)
    
    Autobuild-User(v4-10-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-10-test): Tue Sep 24 20:46:20 UTC 2019 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 python/samba/upgrade.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

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


-- 
Samba Shared Repository