The branch, master has been updated via 77b37e9 lib/util: Remove ntstatus.h and string_wrappers.h include from samba_util.h via 83a3805 debug: Do not depend on the whole of samba_util.h via 88e4b71 torture/ntlm_auth: do not assume a line is less than 2047 bytes via ca961e6 samba-tool: Correct handling of default value for use_ntvfs and use_xattrs from 32116e0 s3/util: mvxattr, a tool to rename extended attributes
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 77b37e937299224eb0750be1f4b1cb487c6c0070 Author: Andrew Bartlett <abart...@samba.org> Date: Wed Feb 1 14:13:28 2017 +1300 lib/util: Remove ntstatus.h and string_wrappers.h include from samba_util.h These are not low-level headers that we need everywhere. Signed-off-by: Andrew Bartlett <abart...@samba.org> Pair-programmed-with: Bob Campbell <bobcampb...@catalyst.net.nz> Reviewed-by: Garming Sam <garm...@catalyst.net.nz> Autobuild-User(master): Andrew Bartlett <abart...@samba.org> Autobuild-Date(master): Sat Feb 11 11:40:45 CET 2017 on sn-devel-144 commit 83a3805461cb4a6848f8f0c6a5052b24a2ec60a5 Author: Andrew Bartlett <abart...@samba.org> Date: Wed Feb 1 13:58:46 2017 +1300 debug: Do not depend on the whole of samba_util.h By depending only on util_strlist.h and blocking.h we avoid pulling in the generated NTSTATUS list for this low-level subsystem Signed-off-by: Andrew Bartlett <abart...@samba.org> Pair-programmed-with: Bob Campbell <bobcampb...@catalyst.net.nz> Reviewed-by: Garming Sam <garm...@catalyst.net.nz> commit 88e4b71e7856f5f1dc4cebd6d4408c9fd4499178 Author: Bob Campbell <bobcampb...@catalyst.net.nz> Date: Wed Jan 18 15:55:49 2017 +1300 torture/ntlm_auth: do not assume a line is less than 2047 bytes These tests would fail when ran in our cloud. This was due to lines that were more than 2047 bytes in length, causing us to fail readLine with a ReadChildError. This fix lets it read lines of any length, but in 2047 byte segments. Signed-off-by: Bob Campbell <bobcampb...@catalyst.net.nz> Reviewed-by: Garming Sam <garm...@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit ca961e6a62987dc75931b7714d94fb998d586888 Author: Andrew Bartlett <abart...@samba.org> Date: Mon Jan 30 15:34:09 2017 +1300 samba-tool: Correct handling of default value for use_ntvfs and use_xattrs Because these options are optional based on build-time rules, we need to encode the default value from the additonal Option() blocks in the run() declaration. Then we can correctly check only for the expected options, and not inconsistently for None (causing classicupgrade to fail). BUG: https://bugzilla.samba.org/show_bug.cgi?id=12543 Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Reviewed-by: Garming Sam <garm...@catalyst.net.nz> ----------------------------------------------------------------------- Summary of changes: lib/util/debug.c | 3 ++- lib/util/samba_util.h | 3 --- python/samba/netcmd/domain.py | 14 +++++++------- source3/torture/test_ntlm_auth.py | 13 +++++++++---- 4 files changed, 18 insertions(+), 15 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/debug.c b/lib/util/debug.c index 08954c3..8a04c25 100644 --- a/lib/util/debug.c +++ b/lib/util/debug.c @@ -27,7 +27,8 @@ #include "time_basic.h" #include "close_low_fd.h" #include "memory.h" -#include "samba_util.h" /* LIST_SEP */ +#include "util_strlist.h" /* LIST_SEP */ +#include "blocking.h" #include "debug.h" /* define what facility to use for syslog */ diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h index aad44dc..3f66369 100644 --- a/lib/util/samba_util.h +++ b/lib/util/samba_util.h @@ -55,9 +55,6 @@ extern const char *panic_action; #include "lib/util/memory.h" -#include "../libcli/util/ntstatus.h" -#include "lib/util/string_wrappers.h" - #include "fault.h" #include "lib/util/util.h" diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 9661828..b4081e6 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -298,9 +298,9 @@ class cmd_domain_provision(Command): partitions_only=None, targetdir=None, ol_mmr_urls=None, - use_xattrs=None, + use_xattrs="auto", slapd_path=None, - use_ntvfs=None, + use_ntvfs=False, use_rfc2307=None, ldap_backend_nosync=None, ldap_backend_extra_port=None, @@ -413,9 +413,9 @@ class cmd_domain_provision(Command): if use_xattrs == "yes": eadb = False - elif use_xattrs == "auto" and use_ntvfs == False or use_ntvfs == None: + elif use_xattrs == "auto" and use_ntvfs == False: eadb = False - elif use_ntvfs == False or use_ntvfs == None: + elif use_ntvfs == False: raise CommandError("--use-xattrs=no requires --use-ntvfs (not supported for production use). " "Please re-run with --use-xattrs omitted.") elif use_xattrs == "auto" and not lp.get("posix:eadb"): @@ -1491,7 +1491,7 @@ class cmd_domain_classicupgrade(Command): takes_args = ["smbconf"] def run(self, smbconf=None, targetdir=None, dbdir=None, testparm=None, - quiet=False, verbose=False, use_xattrs=None, sambaopts=None, versionopts=None, + quiet=False, verbose=False, use_xattrs="auto", sambaopts=None, versionopts=None, dns_backend=None, use_ntvfs=False): if not os.path.exists(smbconf): @@ -1532,9 +1532,9 @@ class cmd_domain_classicupgrade(Command): eadb = True if use_xattrs == "yes": eadb = False - elif use_xattrs == "auto" and use_ntvfs == False or use_ntvfs == None: + elif use_xattrs == "auto" and use_ntvfs == False: eadb = False - elif use_ntvfs == False or use_ntvfs == None: + elif use_ntvfs == False: raise CommandError("--use-xattrs=no requires --use-ntvfs (not supported for production use). " "Please re-run with --use-xattrs omitted.") elif use_xattrs == "auto" and not s3conf.get("posix:eadb"): diff --git a/source3/torture/test_ntlm_auth.py b/source3/torture/test_ntlm_auth.py index fffeb26..076019c5 100755 --- a/source3/torture/test_ntlm_auth.py +++ b/source3/torture/test_ntlm_auth.py @@ -37,10 +37,15 @@ def readLine(pipe): Read a line from the child's pipe, returns the string read. Throws ReadChildError if the read fails. """ - buf = os.read(pipe, 2047) - newline = buf.find('\n') - if newline == -1: - raise ReadChildError() + newline = -1 + buf = "" + while newline == -1: + more = os.read(pipe, 2047) + buf = buf + more + newline = buf.find('\n') + if more == "": + raise ReadChildError() + return buf[:newline] def writeLine(pipe, buf): -- Samba Shared Repository