The branch, master has been updated
via 278070a0cce s3:selftest: Correctly set smbtorture4 targets
via d779abdf060 s4:torture: Fix spoolss tests running against Samba
via 97075059941 s4:torture: Fix checking targets in smb2.getinfo
via 9cc580391df s4:torture: Remove trailing spaces in getinfo.c
via 91b749a8308 s4:torture: Fix checking targets in raw.streams
via 9cccfee12f2 s4:torture: Fix target handling in raw.chkpath
via 3d65ae6a374 s4:selftest: Set smbtorture4 targets correctly
via 3583ffd4e08 s4:torture: Skip test_BackupLog against all of Samba
via 8936398956c s4:torture: Remove obsolete check in raw.close test
via 0853f646a84 s4:torture: Remove obsolete test in samba3.session
from b53ac980e1a s3/mdssvc: add option
"elasticsearch:force_substring_search = yes | no" (default: no)
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 278070a0ccefae7c00303de584b21af8e0cdce35
Author: Andreas Schneider <[email protected]>
Date: Fri Jan 17 11:55:15 2025 +0100
s3:selftest: Correctly set smbtorture4 targets
This is needed that you can correctly skip individual smbtorture4 tests.
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
Autobuild-User(master): Günther Deschner <[email protected]>
Autobuild-Date(master): Mon Jan 27 11:41:40 UTC 2025 on atb-devel-224
commit d779abdf060066ed598d3f89170acee025b74438
Author: Andreas Schneider <[email protected]>
Date: Fri Jan 17 18:32:15 2025 +0100
s4:torture: Fix spoolss tests running against Samba
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit 97075059941ca20844b961ae62941f891de648d6
Author: Andreas Schneider <[email protected]>
Date: Fri Jan 17 14:52:07 2025 +0100
s4:torture: Fix checking targets in smb2.getinfo
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit 9cc580391dfa5b46b828dac88dfa3cd57700bc62
Author: Andreas Schneider <[email protected]>
Date: Fri Jan 17 14:49:27 2025 +0100
s4:torture: Remove trailing spaces in getinfo.c
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit 91b749a8308f5208b4696e8d12e16fec30976293
Author: Andreas Schneider <[email protected]>
Date: Fri Jan 17 13:57:03 2025 +0100
s4:torture: Fix checking targets in raw.streams
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit 9cccfee12f21cce98d1b917d657ac5da000858a4
Author: Andreas Schneider <[email protected]>
Date: Fri Jan 17 13:35:40 2025 +0100
s4:torture: Fix target handling in raw.chkpath
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit 3d65ae6a374cc1717d2ef805aa42074e8ee27bd9
Author: Andreas Schneider <[email protected]>
Date: Fri Jan 17 15:21:13 2025 +0100
s4:selftest: Set smbtorture4 targets correctly
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit 3583ffd4e082e6ccf31747c79f31afd7e2326e2a
Author: Andreas Schneider <[email protected]>
Date: Fri Jan 17 17:50:38 2025 +0100
s4:torture: Skip test_BackupLog against all of Samba
This is a Windows test.
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit 8936398956c25e2e21d42f13feb86735dd061963
Author: Andreas Schneider <[email protected]>
Date: Fri Jan 17 13:27:52 2025 +0100
s4:torture: Remove obsolete check in raw.close test
This would result in an error as the code misses torture_assert calls.
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
commit 0853f646a84e7b49541d503c43cf2da8cd2f1643
Author: Andreas Schneider <[email protected]>
Date: Fri Jan 17 16:45:29 2025 +0100
s4:torture: Remove obsolete test in samba3.session
This test never got executed anyway.
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/selftest/tests.py | 12 +++++++++++-
source4/selftest/tests.py | 6 +++++-
source4/torture/raw/chkpath.c | 7 ++++---
source4/torture/raw/close.c | 9 ---------
source4/torture/raw/streams.c | 12 ++++++++----
source4/torture/rpc/eventlog.c | 5 ++++-
source4/torture/rpc/samba3rpc.c | 12 ------------
source4/torture/rpc/spoolss.c | 37 +++++++++++++++++++++++++------------
source4/torture/smb2/getinfo.c | 10 +++++-----
9 files changed, 62 insertions(+), 48 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 4540aef24b5..437a4a8ee13 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -42,13 +42,23 @@ smbtorture4_options.extend([
def plansmbtorture4testsuite(name, env, options, description='', environ=None):
+ target = 'samba3'
+ if 'ad_dc_ntvfs' in env:
+ target = 'samba4-ntvfs'
+ elif 'ad_dc' in env:
+ target = 'samba4'
+ elif 'fl200' in env:
+ target = 'samba4'
+ elif 's4member' in env:
+ target = 'samba4'
+
if description == '':
modname = "samba3.%s" % (name, )
else:
modname = "samba3.%s %s" % (name, description)
selftesthelpers.plansmbtorture4testsuite(
- name, env, options, target='samba3', modname=modname, environ=environ)
+ name, env, options, target=target, modname=modname, environ=environ)
def compare_versions(version1, version2):
for i in range(max(len(version1),len(version2))):
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 2b6e646e321..fab95fcfef3 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -35,13 +35,17 @@ print("OPTIONS %s" % " ".join(smbtorture4_options),
file=sys.stderr)
def plansmbtorture4testsuite(name, env, options, modname=None, environ=None):
+ target = 'samba4'
+ if 'ntvfs' in env:
+ target = 'samba4-ntvfs'
+
if environ is None:
environ = {}
return selftesthelpers.plansmbtorture4testsuite(name,
env,
options,
- target='samba4',
+ target=target,
modname=modname,
environ=environ)
diff --git a/source4/torture/raw/chkpath.c b/source4/torture/raw/chkpath.c
index 171ddc756c8..90559b1d602 100644
--- a/source4/torture/raw/chkpath.c
+++ b/source4/torture/raw/chkpath.c
@@ -95,7 +95,7 @@ static bool test_path_ex(struct smbcli_state *cli, struct
torture_context *tctx,
if (path_expected &&
(!finfo.name_info.out.fname.s ||
strcmp(finfo.name_info.out.fname.s, path_expected) != 0)) {
- if (tctx && torture_setting_bool(tctx, "samba4", false)) {
+ if (tctx && torture_setting_bool(tctx, "samba4-ntvfs", false)) {
printf("IGNORE: %-30s => %-20s should be %s\n",
path, finfo.name_info.out.fname.s,
path_expected);
return true;
@@ -304,8 +304,9 @@ static bool test_chkpath_names(struct smbcli_state *cli,
struct torture_context
case '?':/*0x3F*/
case '|':/*0x7C*/
if (i == '/' &&
- torture_setting_bool(tctx, "samba3", false)) {
- /* samba 3 handles '/' as '\\' */
+ !torture_setting_bool(tctx, "samba4-ntvfs", false))
+ {
+ /* samba fs handles '/' as '\\' */
break;
}
expected = NT_STATUS_OBJECT_NAME_INVALID;
diff --git a/source4/torture/raw/close.c b/source4/torture/raw/close.c
index b11306803da..de5dc4469ea 100644
--- a/source4/torture/raw/close.c
+++ b/source4/torture/raw/close.c
@@ -95,15 +95,6 @@ bool torture_raw_close(struct torture_context *torture,
&finfo.all_info.out.change_time)) {
printf("Incorrect times after close - only write time should be
set\n");
dump_all_info(torture, &finfo);
-
- if (!torture_setting_bool(torture, "samba3", false)) {
- /*
- * In Samba3 as of 3.0.23d we don't yet support all
- * file times, so don't mark this as a critical
- * failure
- */
- ret = false;
- }
}
diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c
index 90531499df3..16139a0f14b 100644
--- a/source4/torture/raw/streams.c
+++ b/source4/torture/raw/streams.c
@@ -586,7 +586,7 @@ static bool test_stream_delete(struct torture_context *tctx,
/* w2k and w2k3 return 0 and w2k8 returns 1 */
if (TARGET_IS_WINXP(tctx) || TARGET_IS_W2K3(tctx) ||
- TARGET_IS_SAMBA3(tctx)) {
+ TARGET_IS_SAMBA3(tctx) || TARGET_IS_SAMBA4(tctx)) {
CHECK_VALUE(finfo.all_info.out.delete_pending, 0);
} else {
CHECK_VALUE(finfo.all_info.out.delete_pending, 1);
@@ -864,7 +864,9 @@ static bool test_stream_names(struct torture_context *tctx,
stinfo.generic.in.file.fnum = fnum1;
status = smb_raw_fileinfo(cli->tree, tctx, &stinfo);
CHECK_STATUS(status, NT_STATUS_OK);
- if (!torture_setting_bool(tctx, "samba3", false)) {
+ if (!(torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false)))
+ {
CHECK_NTTIME(stinfo.all_info.out.create_time,
finfo.all_info.out.create_time);
CHECK_NTTIME(stinfo.all_info.out.access_time,
@@ -889,7 +891,8 @@ static bool test_stream_names(struct torture_context *tctx,
stinfo.generic.in.file.fnum = fnum1;
status = smb_raw_fileinfo(cli->tree, tctx, &stinfo);
CHECK_STATUS(status, NT_STATUS_OK);
- if (!torture_setting_bool(tctx, "samba3", false)) {
+ if (!(torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false))) {
CHECK_STR(stinfo.name_info.out.fname.s, rpath);
}
@@ -919,7 +922,8 @@ static bool test_stream_names(struct torture_context *tctx,
stinfo.generic.in.file.fnum = fnum1;
status = smb_raw_fileinfo(cli->tree, tctx, &stinfo);
CHECK_STATUS(status, NT_STATUS_OK);
- if (!torture_setting_bool(tctx, "samba3", false)) {
+ if (!(torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false))) {
CHECK_NTTIME(stinfo.all_info.out.write_time,
write_time);
CHECK_VALUE(stinfo.all_info.out.attrib,
diff --git a/source4/torture/rpc/eventlog.c b/source4/torture/rpc/eventlog.c
index 87dc6a2cd31..b6b1da5749c 100644
--- a/source4/torture/rpc/eventlog.c
+++ b/source4/torture/rpc/eventlog.c
@@ -410,7 +410,10 @@ static bool test_BackupLog(struct torture_context *tctx,
struct eventlog_OpenUnknown0 unknown0;
struct dcerpc_binding_handle *b = p->binding_handle;
- if (torture_setting_bool(tctx, "samba3", false)) {
+ if (torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false) ||
+ torture_setting_bool(tctx, "samba4-ntvfs", false))
+ {
torture_skip(tctx, "skipping BackupLog test against samba");
}
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index ac394199eab..6592d996b61 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -1544,18 +1544,6 @@ static bool torture_samba3_sessionkey(struct
torture_context *torture)
cli_credentials_set_workstation(anon_creds, wks_name, CRED_SPECIFIED);
-
- if (!torture_setting_bool(torture, "samba3", false)) {
-
- /* Samba3 in the build farm right now does this happily. Need
- * to fix :-) */
-
- if (test_join3(torture, false, anon_creds, NULL, wks_name)) {
- torture_fail(torture, "join using anonymous bind on an
anonymous smb "
- "connection succeeded -- HUH??\n");
- }
- }
-
torture_assert(torture,
test_join3(torture, false, samba_cmdline_get_creds(),
NULL, wks_name),
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index d2b7a244c11..626a6ff80e8 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -4715,7 +4715,8 @@ static bool test_winreg_symbolic_link(struct
torture_context *tctx,
DATA_BLOB blob;
const char *str;
- if (torture_setting_bool(tctx, "samba3", false)) {
+ if (torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false)) {
torture_skip(tctx, "skip winreg symlink test against samba");
}
@@ -5565,12 +5566,16 @@ static bool test_SetPrinterDataEx_values(struct
torture_context *tctx,
struct spoolss_PrinterEnumValues *einfo;
uint32_t needed = 0;
- if (torture_setting_bool(tctx, "samba3", false)) {
+ if (torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false)) {
char *q;
q = strrchr(values[i], ',');
if (q) {
- torture_comment(tctx, "skipping valuename '%s'
including ',' character against Samba3\n",
- values[i]);
+ torture_comment(
+ tctx,
+ "skipping valuename '%s' including ',' "
+ "character against Samba\n",
+ values[i]);
continue;
}
}
@@ -6790,7 +6795,8 @@ static bool test_printer_rename(struct torture_context
*tctx,
"new printer name was not set");
/* samba currently cannot fully rename printers */
- if (!torture_setting_bool(tctx, "samba3", false)) {
+ if (!(torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false))) {
torture_assert(tctx,
test_OpenPrinter_badname(tctx, b, printer_name_orig),
"still can open printer with oldname after rename");
@@ -7809,8 +7815,10 @@ static bool test_printer_info(struct torture_context
*tctx,
bool ret = true;
- if (torture_setting_bool(tctx, "samba3", false)) {
- torture_skip(tctx, "skipping printer info cross tests against
samba 3");
+ if (torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false)) {
+ torture_skip(tctx,
+ "skipping printer info cross tests against samba");
}
if (!test_PrinterInfo(tctx, b, &t->handle)) {
@@ -8911,7 +8919,8 @@ static bool test_print_test_properties(struct
torture_context *tctx,
struct dcerpc_pipe *p = t->spoolss_pipe;
struct dcerpc_binding_handle *b = p->binding_handle;
- if (torture_setting_bool(tctx, "samba3", false)) {
+ if (torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false)) {
torture_skip(tctx, "skip printer job property tests against
samba");
}
@@ -9240,7 +9249,8 @@ static bool test_printer_ic(struct torture_context *tctx,
struct dcerpc_binding_handle *b = p->binding_handle;
struct policy_handle gdi_handle;
- if (torture_setting_bool(tctx, "samba3", false)) {
+ if (torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false)) {
torture_skip(tctx, "skip printer information context tests
against samba");
}
@@ -9349,7 +9359,8 @@ static bool test_printer_bidi(struct torture_context
*tctx,
struct RPC_BIDI_REQUEST_CONTAINER bidi_req;
struct RPC_BIDI_RESPONSE_CONTAINER *bidi_rep = NULL;
- if (torture_setting_bool(tctx, "samba3", false)) {
+ if (torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false)) {
torture_skip(tctx, "skip printer bidirectional tests against
samba");
}
@@ -11043,7 +11054,8 @@ static bool test_add_driver_arg(struct torture_context
*tctx,
for (i=0; i < ARRAY_SIZE(levels); i++) {
- if (torture_setting_bool(tctx, "samba3", false)) {
+ if (torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false)) {
switch (levels[i]) {
case 2:
case 4:
@@ -11086,7 +11098,8 @@ static bool test_add_driver_arg(struct torture_context
*tctx,
for (i=0; i < ARRAY_SIZE(levels); i++) {
- if (torture_setting_bool(tctx, "samba3", false)) {
+ if (torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false)) {
switch (levels[i]) {
case 2:
case 4:
diff --git a/source4/torture/smb2/getinfo.c b/source4/torture/smb2/getinfo.c
index 539090ac71a..ed5a7e37d2d 100644
--- a/source4/torture/smb2/getinfo.c
+++ b/source4/torture/smb2/getinfo.c
@@ -1,20 +1,20 @@
-/*
+/*
Unix SMB/CIFS implementation.
SMB2 getinfo test suite
Copyright (C) Andrew Tridgell 2005
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -588,7 +588,7 @@ static bool torture_smb2_qfs_buffercheck(struct
torture_context *tctx)
for (i=0; i<ARRAY_SIZE(levels); i++) {
struct smb2_getinfo b;
- if (TARGET_IS_SAMBA3(tctx) &&
+ if ((TARGET_IS_SAMBA3(tctx) || TARGET_IS_SAMBA4(tctx)) &&
((levels[i].level == 6) || (levels[i].level == 11))) {
continue;
}
--
Samba Shared Repository
