From: Noel Power Date: Wed, 8 Aug 2018 15:56:33 +0000 (+0100) Subject: python/samba: open files in binary mode as appropriate X-Git-Tag: tdb-1.3.17~1943 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=596db3a5bbca2e93e22a4405d2ad60144bcaf273;p=thirdparty%2Fsamba.git python/samba: open files in binary mode as appropriate Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index 5b0a71f0241..81272095c48 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -1082,7 +1082,7 @@ def setup_encrypted_secrets_key(path): finally: os.umask(umask_original) - with os.fdopen(fd, 'w') as f: + with os.fdopen(fd, 'wb') as f: key = samba.generate_random_bytes(16) f.write(key) diff --git a/python/samba/schema.py b/python/samba/schema.py index 59b53faf5cd..918f3f7ecc0 100644 --- a/python/samba/schema.py +++ b/python/samba/schema.py @@ -112,7 +112,7 @@ class Schema(object): if files is not None: for file in files: - self.schema_data += open(file, 'r').read() + self.schema_data += open(file, 'rb').read() self.schema_data = substitute_var(self.schema_data, {"SCHEMADN": schemadn}) @@ -131,7 +131,7 @@ class Schema(object): if override_prefixmap is not None: self.prefixmap_data = override_prefixmap else: - self.prefixmap_data = open(setup_path("prefixMap.txt"), 'r').read() + self.prefixmap_data = open(setup_path("prefixMap.txt"), 'rb').read() if additional_prefixmap is not None: for map in additional_prefixmap: