[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0bcfc550b1a gp_inf: Read/write files with a UTF-16LE BOM in
GptTmpl.inf
from b0fc1ca65ab lib: Fix the 32-bit build
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0bcfc550b1a902e3a6a766b06603ac9285d0ff63
Author: Garming Sam
Date: Thu Jul 18 14:50:57 2019 +1200
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
Reviewed-by: Gary Lockyer
Autobuild-User(master): Gary Lockyer
Autobuild-Date(master): Fri Jul 19 02:20:47 UTC 2019 on sn-devel-184
---
Summary of changes:
python/samba/gp_parse/gp_inf.py | 9 ++---
.../Windows NT/SecEdit/GptTmpl.inf.SAMBABACKUP| Bin 2580 -> 2582 bytes
2 files changed, 6 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
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 18c58a7baa9..8de94078e70 100644
Binary files
a/source4/selftest/provisions/generalized-gpo-backup/policy/{1E1DC8EA-390C-4800-B327-98B56A0AEA5D}/Machine/Microsoft/Windows
NT/SecEdit/GptTmpl.inf.SAMBABACKUP and
b/source4/selftest/provisions/generalized-gpo-backup/policy/{1E1DC8EA-390C-4800-B327-98B56A0AEA5D}/Machine/Microsoft/Windows
NT/SecEdit/GptTmpl.inf.SAMBABACKUP differ
--
Samba Shared Repository
autobuild[sn-devel-184]: intermittent test failure detected
The autobuild test system (on sn-devel-184) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: https://git.samba.org/autobuild.flakey.sn-devel-184/2019-07-18-1613/flakey.log The failure seems to be in the "samba-nt4" suite, whose build logs are available here: https://git.samba.org/autobuild.flakey.sn-devel-184/2019-07-18-1613/samba-nt4.stderr https://git.samba.org/autobuild.flakey.sn-devel-184/2019-07-18-1613/samba-nt4.stdout The top commit at the time of the failure was: commit b0fc1ca65abd49d5391ea1213c78c2bc22641c36 Author: Volker Lendecke Date: Wed Jul 17 21:52:55 2019 +0200 lib: Fix the 32-bit build Signed-off-by: Volker Lendecke Reviewed-by: Andreas Schneider Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Thu Jul 18 12:55:30 UTC 2019 on sn-devel-184 and the last 50 lines of the stdout log were: [560(2553)/604 at 31m11s] samba.wbinfo_simple.online-status.domain=$DOMAIN(nt4_dc:local) [561(2554)/604 at 31m11s] samba.wbinfo_simple.check-secret.domain=$DOMAIN(nt4_dc:local) [562(2555)/604 at 31m11s] samba.wbinfo_simple.change-secret.domain=$DOMAIN(nt4_dc:local) [563(2556)/604 at 31m11s] samba.wbinfo_simple.check-secret.domain=$DOMAIN(nt4_dc:local) [564(2557)/604 at 31m12s] samba.wbinfo_simple.online-status.domain=$DOMAIN(nt4_dc:local) [565(2558)/604 at 31m12s] samba.wbinfo_simple.domain-users(nt4_dc:local) [566(2559)/604 at 31m12s] samba.wbinfo_simple.domain-groups(nt4_dc:local) [567(2560)/604 at 31m12s] samba.wbinfo_simple.name-to-sid=$DC_USERNAME(nt4_dc:local) [568(2561)/604 at 31m12s] samba.wbinfo_simple.name-to-sid=$DOMAIN/$DC_USERNAME(nt4_dc:local) [569(2562)/604 at 31m12s] samba.wbinfo_simple.user-info=$DOMAIN/$DC_USERNAME(nt4_dc:local) [570(2563)/604 at 31m12s] samba.wbinfo_simple.user-groups=$DOMAIN/$DC_USERNAME(nt4_dc:local) [571(2564)/604 at 31m13s] samba.wbinfo_simple.authenticate=$DOMAIN/$DC_USERNAME%$DC_PASSWORD(nt4_dc:local) [572(2565)/604 at 31m13s] samba.wbinfo_simple.allocate-uid(nt4_dc:local) [573(2566)/604 at 31m13s] samba.wbinfo_simple.allocate-gid(nt4_dc:local) [574(2567)/604 at 31m13s] samba.wbinfo_sids2xids.(nt4_dc:local)(nt4_dc:local) [575(2568)/604 at 31m21s] samba.tests.ntlm_auth(nt4_dc:local) [576(2581)/604 at 31m23s] samba.wbinfo_simple.ping(nt4_member:local) [577(2582)/604 at 31m24s] samba.wbinfo_simple.separator(nt4_member:local) [578(2583)/604 at 31m24s] samba.wbinfo_simple.own-domain(nt4_member:local) [579(2584)/604 at 31m24s] samba.wbinfo_simple.all-domains(nt4_member:local) [580(2585)/604 at 31m24s] samba.wbinfo_simple.trusted-domains(nt4_member:local) [581(2586)/604 at 31m24s] samba.wbinfo_simple.domain-info=BUILTIN(nt4_member:local) [582(2587)/604 at 31m24s] samba.wbinfo_simple.domain-info=$DOMAIN(nt4_member:local) [583(2588)/604 at 31m24s] samba.wbinfo_simple.online-status(nt4_member:local) [584(2589)/604 at 31m24s] samba.wbinfo_simple.online-status.domain=BUILTIN(nt4_member:local) [585(2590)/604 at 31m25s] samba.wbinfo_simple.online-status.domain=$DOMAIN(nt4_member:local) [586(2591)/604 at 31m25s] samba.wbinfo_simple.check-secret.domain=$DOMAIN(nt4_member:local) UNEXPECTED(failure): samba.wbinfo_simple.check-secret.domain=SAMBA-TEST.wbinfo(nt4_member:local) REASON: Exception: Exception: wbcCheckTrustCredentials(SAMBA-TEST): error code was NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND (0xc233) failed to call wbcCheckTrustCredentials: WBC_ERR_AUTH_ERROR Could not check secret checking the trust secret for domain SAMBA-TEST via RPC calls failed FAILED (1 failures, 0 errors and 0 unexpected successes in 0 testsuites) A summary with detailed information can be found in: ./bin/ab/summary TOP 10 slowest tests samba3.smb2.lease(nt4_dc) -> 159 samba3.raw.notify(nt4_dc) -> 105 samba3.smb2.oplock(nt4_dc) -> 104 samba3.smb2.compound_find(nt4_dc) -> 96 samba3.smb2.compound_find(nt4_dc) -> 95 samba3.smb2.notify(nt4_dc) -> 82 samba3.blackbox.net.rpc.conf(nt4_dc) -> 74 samba3.rpc.samr.passwords.lockout(nt4_dc) -> 62 samba4.rpc.echo on ncacn_np with object(nt4_dc) -> 61 samba3.base.dir2(nt4_dc) -> 59 ERROR: test failed with exit code 1 Makefile:16: recipe for target 'test' failed
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b0fc1ca65ab lib: Fix the 32-bit build
from 664eed2e926 lib:util: Use GnuTLS random number generator in
genrand.c
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b0fc1ca65abd49d5391ea1213c78c2bc22641c36
Author: Volker Lendecke
Date: Wed Jul 17 21:52:55 2019 +0200
lib: Fix the 32-bit build
Signed-off-by: Volker Lendecke
Reviewed-by: Andreas Schneider
Autobuild-User(master): Andreas Schneider
Autobuild-Date(master): Thu Jul 18 12:55:30 UTC 2019 on sn-devel-184
---
Summary of changes:
source3/lib/adouble.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/adouble.c b/source3/lib/adouble.c
index 4e2d9e01b48..9690f65b8a7 100644
--- a/source3/lib/adouble.c
+++ b/source3/lib/adouble.c
@@ -1638,7 +1638,7 @@ static bool ad_collect_one_stream(struct
vfs_handle_struct *handle,
if (stream->size != AFP_INFO_SIZE) {
DBG_ERR("Bad size [%zd] on [%s]\n",
- stream->size,
+ (ssize_t)stream->size,
smb_fname_str_dbg(sname));
ok = false;
goto out;
@@ -1647,7 +1647,7 @@ static bool ad_collect_one_stream(struct
vfs_handle_struct *handle,
nread = SMB_VFS_PREAD(fsp, buf, stream->size, 0);
if (nread != AFP_INFO_SIZE) {
DBG_ERR("Bad size [%zd] on [%s]\n",
- stream->size,
+ (ssize_t)stream->size,
smb_fname_str_dbg(sname));
ok = false;
goto out;
@@ -1684,7 +1684,7 @@ static bool ad_collect_one_stream(struct
vfs_handle_struct *handle,
0);
if (nread != stream->size) {
DBG_ERR("Bad size [%zd] on [%s]\n",
- stream->size,
+ (ssize_t)stream->size,
smb_fname_str_dbg(sname));
ok = false;
goto out;
@@ -1780,7 +1780,7 @@ static bool ad_collect_one_stream(struct
vfs_handle_struct *handle,
0);
if (nread != stream->size) {
DBG_ERR("Bad size [%zd] on [%s]\n",
- stream->size,
+ (ssize_t)stream->size,
smb_fname_str_dbg(sname));
ok = false;
goto out;
--
Samba Shared Repository
