Attachment 15316 Details for Bug 14004 – Backported patch for 4.11

[patch] Backported patch for 4.11

patch-for-4-11.patch (text/plain), 2.58 KB, created by Garming Sam on 2019-07-19 02:50:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Garming Sam

Created: 2019-07-19 02:50:20 UTC

Size: 2.58 KB

patch

obsolete

>From a372878f1a27f9b3014c6cc5e969824e69b05f85 Mon Sep 17 00:00:00 2001
>From: Garming Sam <garming@catalyst.net.nz>
>Date: Thu, 18 Jul 2019 14:50:57 +1200
>Subject: [PATCH] gp_inf: Read/write files with a UTF-16LE BOM in GptTmpl.inf
>
>Regression caused by 16596842a62bec0a9d974c48d64000e3c079254e
>
>[MS-GPSB] 2.2 Message Syntax says that you have to write a BOM which I
>didn't do up until this patch. UTF-16 as input encoding was marked much
>higher up in the inheritance tree, which got overriden with the Python 3
>fixes. I've now marked the encoding much more obviously for this file.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14004
>
>Signed-off-by: Garming Sam <garming@catalyst.net.nz>
>Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
>
>Autobuild-User(master): Gary Lockyer <gary@samba.org>
>Autobuild-Date(master): Fri Jul 19 02:20:47 UTC 2019 on sn-devel-184
>
>(cherry picked from commit 0bcfc550b1a902e3a6a766b06603ac9285d0ff63)
>---
> python/samba/gp_parse/gp_inf.py               |   9 ++++++---
> .../SecEdit/GptTmpl.inf.SAMBABACKUP           | Bin 2580 -> 2582 bytes
> 2 files changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/python/samba/gp_parse/gp_inf.py b/python/samba/gp_parse/gp_inf.py
>index 79e28159f1f..a3c828fa82d 100644
>--- a/python/samba/gp_parse/gp_inf.py
>+++ b/python/samba/gp_parse/gp_inf.py
>@@ -29,11 +29,11 @@ from samba.gp_parse import GPParser
> # [MS-GPSB] Security Protocol Extension
> class GptTmplInfParser(GPParser):
>     sections = None
>-    encoding = 'utf-16le'
>+    encoding = 'utf-16'
>+    output_encoding = 'utf-16le'
> 
>     class AbstractParam:
>         __metaclass__ = ABCMeta
>-        encoding = 'utf-16le'
> 
>         def __init__(self):
>             self.param_list = []
>@@ -333,7 +333,10 @@ class GptTmplInfParser(GPParser):
> 
>     def write_binary(self, filename):
>         with codecs.open(filename, 'wb+',
>-                         self.encoding) as f:
>+                         self.output_encoding) as f:
>+            # Write the byte-order mark
>+            f.write(u'\ufeff')
>+
>             for s in self.sections:
>                 self.sections[s].write_section(s, f)
> 
>diff --git a/source4/selftest/provisions/generalized-gpo-backup/policy/{1E1DC8EA-390C-4800-B327-98B56A0AEA5D}/Machine/Microsoft/Windows NT/SecEdit/GptTmpl.inf.SAMBABACKUP b/source4/selftest/provisions/generalized-gpo-backup/policy/{1E1DC8EA-390C-4800-B327-98B56A0AEA5D}/Machine/Microsoft/Windows NT/SecEdit/GptTmpl.inf.SAMBABACKUP
>index 18c58a7baa9566be4977086640f4ad8c3e4c38a7..8de94078e703e9adf222dfc0bd4bfff31e797bbd 100644
>GIT binary patch
>delta 10
>RcmbOtGEIc(|Gy0)TmTmX1Rwwa
>
>delta 8
>PcmbOxGDTz~lL!|83>*R^
>
>-- 
>2.17.1
>

Flags:

garming: review? (abartlet)
dbagnall: review+

Actions: View

Attachments on bug 14004: 15315 | 15316 | 15317 | 15538