The branch, master has been updated via 570c425dba7 test: Get the clusteredmember environment out of its smb1 corner via c7a3e5503d8 test: Lift clusteredmember_smb1 to use smb2 via 4c5a0cab9d4 test: Use the smb2-based deny2 test in clusteredmember_smb1 from 6bf1b9885b7 CVE-2020-1472(ZeroLogon): torture: ServerSetPassword2 zero password
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 570c425dba7f9ccb36d63c560a172573571728af Author: Volker Lendecke <v...@samba.org> Date: Fri Oct 16 16:09:33 2020 +0200 test: Get the clusteredmember environment out of its smb1 corner Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> Autobuild-User(master): Ralph Böhme <s...@samba.org> Autobuild-Date(master): Fri Oct 16 18:30:18 UTC 2020 on sn-devel-184 commit c7a3e5503d8d97a8ae625553778ecaaeb9ab03cb Author: Volker Lendecke <v...@samba.org> Date: Fri Oct 16 16:08:03 2020 +0200 test: Lift clusteredmember_smb1 to use smb2 Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> commit 4c5a0cab9d4b82940d738fa2355e2603671c1ca8 Author: Volker Lendecke <v...@samba.org> Date: Fri Oct 16 16:06:36 2020 +0200 test: Use the smb2-based deny2 test in clusteredmember_smb1 There is no reason to use the SMB1-based ntdeny2 test. It was just an arbitrary test that depends on clustering to work. Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Ralph Boehme <s...@samba.org> ----------------------------------------------------------------------- Summary of changes: script/autobuild.py | 6 +++--- selftest/target/Samba3.pm | 6 ++---- source3/selftest/tests.py | 12 ++++++------ 3 files changed, 11 insertions(+), 13 deletions(-) Changeset truncated at 500 lines: diff --git a/script/autobuild.py b/script/autobuild.py index 47bc8289491..0bf80d5e821 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -257,7 +257,7 @@ tasks = { "ad_dc_slowtests", "schema_pair_dc", "schema_dc", - "clusteredmember_smb1", + "clusteredmember", ])), ("test-slow-none", make_test(cmd='make test', TESTS="--include=selftest/slow-none", include_envs=["none"])), ("lcov", LCOV_CMD), @@ -320,7 +320,7 @@ tasks = { "ad_dc_slowtests", "schema_pair_dc", "schema_dc", - "clusteredmember_smb1", + "clusteredmember", ])), ("lcov", LCOV_CMD), ("install", "make install"), @@ -609,7 +609,7 @@ tasks = { ("test", make_test(cmd='make test', - include_envs=["clusteredmember_smb1"]) + include_envs=["clusteredmember"]) ), # clean up: diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 72d7642fcb7..646ff9b4895 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -239,7 +239,7 @@ sub check_env($$) ad_member_idmap_ad => ["fl2008r2dc"], ad_member_fips => ["ad_dc_fips"], - clusteredmember_smb1 => ["nt4_dc"], + clusteredmember => ["nt4_dc"], ); %Samba3::ENV_DEPS_POST = (); @@ -465,7 +465,7 @@ sub setup_nt4_member return $ret; } -sub setup_clusteredmember_smb1 +sub setup_clusteredmember { my ($self, $prefix, $nt4_dc_vars) = @_; my $count = 0; @@ -515,8 +515,6 @@ sub setup_clusteredmember_smb1 server signing = on clustering = yes ctdbd socket = ${socket} - client min protocol = CORE - server min protocol = LANMAN1 dbwrap_tdb_mutexes:* = yes ${require_mutexes} "; diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 002f6d4a4b0..f0b01a8a740 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -1134,7 +1134,7 @@ plantestsuite("samba3.blackbox.smbclient-mget", t = "readdir-timestamp" plantestsuite( "samba3.smbtorture_s3.plain.%s" % t, - "clusteredmember_smb1", + "clusteredmember", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, @@ -1143,7 +1143,7 @@ plantestsuite( '$DC_PASSWORD', smbtorture3, "", - "-b $PREFIX/clusteredmember_smb1/unclists/tmp.txt -N 5 -o 10"]) + "-b $PREFIX/clusteredmember/unclists/tmp.txt -N 5 -o 10"]) def planclusteredmembertestsuite(tname, prefix): '''Define a clustered test for the clusteredmember environment''' @@ -1155,7 +1155,7 @@ def planclusteredmembertestsuite(tname, prefix): modnamearg = 'samba3.%s' % namearg extraargs = '' - prefix = os.path.join(prefix, 'clusteredmember_smb1') + prefix = os.path.join(prefix, 'clusteredmember') unclist = os.path.join(prefix, 'unclists/%s.txt' % tshare) unclistarg = '--unclist=%s' % unclist @@ -1163,13 +1163,13 @@ def planclusteredmembertestsuite(tname, prefix): return selftesthelpers.plansmbtorture4testsuite( namearg, - 'clusteredmember_smb1', + 'clusteredmember', [extraargs, unclistarg, sharearg, autharg, tname], target='samba3', modname=modnamearg) -CLUSTERED_TESTS = [ 'base.ntdeny2' ] +CLUSTERED_TESTS = [ 'smb2.deny.deny2' ] for test in CLUSTERED_TESTS: planclusteredmembertestsuite(test, "$PREFIX") @@ -1182,7 +1182,7 @@ CLUSTERED_LOCAL_TESTS = [ for t in CLUSTERED_LOCAL_TESTS: plantestsuite( "samba3.%s" % t, - "clusteredmember_smb1:local", + "clusteredmember:local", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//foo/bar', -- Samba Shared Repository