The branch, master has been updated via 465e518d6cc classicupgrade: fix a a bytes-like object is required, not 'str' error via ec4c5975528 fault.c: improve fault_report message text pointing to our wiki from 89288c7e839 samba_version.py: avoid inefficient string concatenations
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 465e518d6cc200eefa38643e720ce64e53abac2e Author: Björn Jacke <b...@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 <bja...@samba.org> Reviewed-by: Björn Baumbach <b...@samba.org> Autobuild-User(master): Björn Jacke <bja...@samba.org> Autobuild-Date(master): Mon Sep 23 12:58:20 UTC 2019 on sn-devel-184 commit ec4c5975528f3d3ab9c8813e176c6d1a2f1ca506 Author: Björn Jacke <b...@sernet.de> Date: Mon Sep 23 08:57:33 2019 +0200 fault.c: improve fault_report message text pointing to our wiki BUG: https://bugzilla.samba.org/show_bug.cgi?id=14139 Signed-off-by: Bjoern Jacke <bja...@samba.org> Reviewed-by: Alexander Bokovoy <a...@samba.org> ----------------------------------------------------------------------- Summary of changes: lib/util/fault.c | 6 +++++- python/samba/upgrade.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/fault.c b/lib/util/fault.c index 5be9162679e..c42bc51789a 100644 --- a/lib/util/fault.c +++ b/lib/util/fault.c @@ -78,7 +78,11 @@ static void fault_report(int sig) DEBUGSEP(0); DEBUG(0,("INTERNAL ERROR: Signal %d in pid %d (%s)",sig,(int)getpid(),SAMBA_VERSION_STRING)); - DEBUG(0,("\nPlease read the Trouble-Shooting section of the Samba HOWTO\n")); + DEBUG(0,("\nIf you are running a recent Samba version, and " + "if you think this problem is not yet fixed in the " + "latest versions, please consider reporting this " + "bug, see " + "https://wiki.samba.org/index.php/Bug_Reporting\n")); DEBUGSEP(0); smb_panic("internal error"); 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