The branch, master has been updated via 7a413a6dab3 python/samba: ignore encoding errors while reading files via d01c5bc9fbe provision: use ASCII quotes from c7f403d3730 lib:util: Include talloc_keep_secret.h in samba_util.h
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 7a413a6dab3b0ffe4ea210adfd79d93d1b62215c Author: Philipp Gesang <philipp.ges...@intra2net.com> Date: Tue Mar 12 15:43:42 2019 +0100 python/samba: ignore encoding errors while reading files Provisioning fails on C locale due to the Unicode quotes in ldif data. Patch read_and_sub_file() to read the files as UTF-8. Signed-off-by: Philipp Gesang <philipp.ges...@intra2net.com> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Autobuild-User(master): Noel Power <npo...@samba.org> Autobuild-Date(master): Wed Apr 3 11:33:38 UTC 2019 on sn-devel-144 commit d01c5bc9fbe316d2358ead6382f4e7e3bf5fc000 Author: Philipp Gesang <philipp.ges...@intra2net.com> Date: Tue Mar 12 15:51:16 2019 +0100 provision: use ASCII quotes Remove some Unicode quotes that cause problems under the C locale. Signed-off-by: Philipp Gesang <philipp.ges...@intra2net.com> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: python/samba/__init__.py | 2 +- source4/setup/extended-rights.ldif | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/python/samba/__init__.py b/python/samba/__init__.py index 93240dddfbb..d851bf3606c 100644 --- a/python/samba/__init__.py +++ b/python/samba/__init__.py @@ -280,7 +280,7 @@ def read_and_sub_file(file_name, subst_vars): :param file_name: File to be read (typically from setup directory) param subst_vars: Optional variables to subsitute in the file. """ - data = open(file_name, 'r').read() + data = open(file_name, 'r', encoding="utf-8").read() if subst_vars is not None: data = substitute_var(data, subst_vars) check_all_substituted(data) diff --git a/source4/setup/extended-rights.ldif b/source4/setup/extended-rights.ldif index ef4c3049601..67417b7d020 100644 --- a/source4/setup/extended-rights.ldif +++ b/source4/setup/extended-rights.ldif @@ -11,7 +11,7 @@ # # Technical Documentation. Microsoft publishes Open Specifications -# documentation (“this documentation”) for protocols, file formats, +# documentation ("this documentation") for protocols, file formats, # data portability, computer languages, and standards # support. Additionally, overview documents cover inter-protocol # relationships and interactions. -- Samba Shared Repository