sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s4:torture/smb2: remove MULTI_CHANNEL checking from smb2.replay.channel-sequence

Browse Source 
This test doesn't need multi-channel. But we need to
force using the channel_sequence, as our client libraries
only use them for multi-channel connections or persistent handles.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2020-06-24 17:41:15 +02:00 committed by Jeremy Allison
parent f1ecaa75a2
commit c603a50a48
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
selftest/knownfail
View File

@ -211,9 +211,8 @@
^samba3.smb2.session.*reauth5 # some special anonymous checks?
^samba3.smb2.compound.interim2 # wrong return code (STATUS_CANCELLED)
^samba3.smb2.compound.aio.interim2 # wrong return code (STATUS_CANCELLED)
^samba3.smb2.replay.channel-sequence
^samba3.smb2.replay.replay3
^samba3.smb2.replay.replay4
^samba3.smb2.replay.replay3 # This requires multi-chanel
^samba3.smb2.replay.replay4 # This requires multi-chanel
^samba3.smb2.lock.replay_smb3_specification # This requires multi-chanel or durable handles
^samba3.smb2.lock.*replay_broken_windows # This tests the windows behaviour
^samba3.smb2.lease.statopen3

10
source4/torture/smb2/replay.c
View File

@ -1580,7 +1580,6 @@ static bool test_channel_sequence(struct torture_context *tctx,
const char *fname = BASEDIR "\\channel_sequence.dat";
struct smb2_transport *transport1 = tree->session->transport;
struct smb2_handle handle;
uint32_t server_capabilities;
uint16_t opcodes[] = { SMB2_OP_WRITE, SMB2_OP_IOCTL, SMB2_OP_SETINFO };
int i;
@ -1589,15 +1588,10 @@ static bool test_channel_sequence(struct torture_context *tctx,
"Replay tests\n");
}
server_capabilities = smb2cli_conn_server_capabilities(
tree->session->transport->conn);
if (!(server_capabilities & SMB2_CAP_MULTI_CHANNEL)) {
torture_skip(tctx,
"Server does not support multi-channel.");
}
torture_comment(tctx, "Testing channel sequence numbers\n");
smbXcli_conn_set_force_channel_sequence(transport1->conn, true);
torture_assert_ntstatus_ok_goto(tctx,
torture_smb2_testdir(tree, BASEDIR, &handle),
ret, done, "failed to setup test directory");