s4-torture: remove SO share code from multichannel oplock test.

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Pair-Programmed-With: Jose A. Rivera <jarrpa@samba.org>

diff --git a/source4/torture/smb2/multichannel.c b/source4/torture/smb2/multichannel.c
index 509c68fa39e2b5c370ff450776bb144eb460a608..351633cd31c525abd4f95d46f5c76d0d4554f3d1 100644 (file)
--- a/source4/torture/smb2/multichannel.c
+++ b/source4/torture/smb2/multichannel.c
@@ -291,8 +291,6 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
        struct smb2_session *session2A = NULL;
        struct smb2_session *session2B = NULL;
        struct smb2_session *session2C = NULL;
-       uint32_t share_capabilities;
-       bool share_is_so;
        uint32_t server_capabilities;
        struct fsctl_net_iface_info info;
        uint16_t local_port = 0;
@@ -312,9 +310,6 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
                             "Server does not support multichannel.");
        }
 
-       share_capabilities = smb2cli_tcon_capabilities(tree1->smbXcli);
-       share_is_so = share_capabilities & SMB2_SHARE_CAP_SCALEOUT;
-
        torture_comment(tctx, "Testing Oplock Break on multiple channels\n");
 
        torture_assert(tctx,
@@ -444,15 +439,9 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client2_file1 = io1.out.file.handle;
        CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
-       if (share_is_so) {
-               CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("s"));
-               CHECK_VAL(io1.out.durable_open_v2, false);
-               CHECK_VAL(io1.out.timeout, 0);
-       } else {
-               CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("b"));
-               CHECK_VAL(io1.out.durable_open_v2, true);
-               CHECK_VAL(io1.out.timeout, io1.in.timeout);
-       }
+       CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("b"));
+       CHECK_VAL(io1.out.durable_open_v2, true);
+       CHECK_VAL(io1.out.timeout, io1.in.timeout);
        CHECK_VAL(io1.out.durable_open, false);
        torture_wait_for_oplock_break(tctx);
        CHECK_VAL(break_info.count, 0);
@@ -465,15 +454,9 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client2_file2 = io2.out.file.handle;
        CHECK_CREATED(&io2, CREATED, FILE_ATTRIBUTE_ARCHIVE);
-       if (share_is_so) {
-               CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("s"));
-               CHECK_VAL(io2.out.durable_open_v2, false);
-               CHECK_VAL(io2.out.timeout, 0);
-       } else {
-               CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("b"));
-               CHECK_VAL(io2.out.durable_open_v2, true);
-               CHECK_VAL(io2.out.timeout, io2.in.timeout);
-       }
+       CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("b"));
+       CHECK_VAL(io2.out.durable_open_v2, true);
+       CHECK_VAL(io2.out.timeout, io2.in.timeout);
        CHECK_VAL(io2.out.durable_open, false);
        torture_wait_for_oplock_break(tctx);
        CHECK_VAL(break_info.count, 0);
@@ -490,15 +473,9 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client1_file1 = io1.out.file.handle;
        CHECK_CREATED(&io1, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
-       if (share_is_so) {
-               CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("s"));
-               CHECK_VAL(io1.out.durable_open_v2, false);
-               CHECK_VAL(io1.out.timeout, 0);
-       } else {
-               CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("s"));
-               CHECK_VAL(io1.out.durable_open_v2, false);
-               CHECK_VAL(io1.out.timeout, 0);
-       }
+       CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("s"));
+       CHECK_VAL(io1.out.durable_open_v2, false);
+       CHECK_VAL(io1.out.timeout, 0);
        CHECK_VAL(io1.out.durable_open, false);
        torture_wait_for_oplock_break(tctx);
        CHECK_VAL(break_info.count, 1);
@@ -517,15 +494,9 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client1_file2 = io2.out.file.handle;
        CHECK_CREATED(&io2, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
-       if (share_is_so) {
-               CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("s"));
-               CHECK_VAL(io2.out.durable_open_v2, false);
-               CHECK_VAL(io2.out.timeout, 0);
-       } else {
-               CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("s"));
-               CHECK_VAL(io2.out.durable_open_v2, false);
-               CHECK_VAL(io2.out.timeout, 0);
-       }
+       CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("s"));
+       CHECK_VAL(io2.out.durable_open_v2, false);
+       CHECK_VAL(io2.out.timeout, 0);
        CHECK_VAL(io2.out.durable_open, false);
        torture_wait_for_oplock_break(tctx);
        CHECK_VAL(break_info.count, 1);
@@ -609,15 +580,9 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client2_file1 = io1.out.file.handle;
        CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
-       if (share_is_so) {
-               CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("s"));
-               CHECK_VAL(io1.out.durable_open_v2, false);
-               CHECK_VAL(io1.out.timeout, 0);
-       } else {
-               CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("b"));
-               CHECK_VAL(io1.out.durable_open_v2, true);
-               CHECK_VAL(io1.out.timeout, io1.in.timeout);
-       }
+       CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("b"));
+       CHECK_VAL(io1.out.durable_open_v2, true);
+       CHECK_VAL(io1.out.timeout, io1.in.timeout);
        CHECK_VAL(io1.out.durable_open, false);
        torture_wait_for_oplock_break(tctx);
        CHECK_VAL(break_info.count, 0);
@@ -630,15 +595,9 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client2_file2 = io2.out.file.handle;
        CHECK_CREATED(&io2, CREATED, FILE_ATTRIBUTE_ARCHIVE);
-       if (share_is_so) {
-               CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("s"));
-               CHECK_VAL(io2.out.durable_open_v2, false);
-               CHECK_VAL(io2.out.timeout, 0);
-       } else {
-               CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("b"));
-               CHECK_VAL(io2.out.durable_open_v2, true);
-               CHECK_VAL(io2.out.timeout, io2.in.timeout);
-       }
+       CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("b"));
+       CHECK_VAL(io2.out.durable_open_v2, true);
+       CHECK_VAL(io2.out.timeout, io2.in.timeout);
        CHECK_VAL(io2.out.durable_open, false);
        torture_wait_for_oplock_break(tctx);
        CHECK_VAL(break_info.count, 0);
@@ -655,15 +614,9 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client1_file1 = io1.out.file.handle;
        CHECK_CREATED(&io1, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
-       if (share_is_so) {
-               CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("s"));
-               CHECK_VAL(io1.out.durable_open_v2, false);
-               CHECK_VAL(io1.out.timeout, 0);
-       } else {
-               CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("s"));
-               CHECK_VAL(io1.out.durable_open_v2, false);
-               CHECK_VAL(io1.out.timeout, 0);
-       }
+       CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("s"));
+       CHECK_VAL(io1.out.durable_open_v2, false);
+       CHECK_VAL(io1.out.timeout, 0);
        CHECK_VAL(io1.out.durable_open, false);
        torture_wait_for_oplock_break(tctx);
        CHECK_VAL(break_info.count, 1);
@@ -686,15 +639,9 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client1_file2 = io2.out.file.handle;
        CHECK_CREATED(&io2, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
-       if (share_is_so) {
-               CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("s"));
-               CHECK_VAL(io2.out.durable_open_v2, false);
-               CHECK_VAL(io2.out.timeout, 0);
-       } else {
-               CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("s"));
-               CHECK_VAL(io2.out.durable_open_v2, false);
-               CHECK_VAL(io2.out.timeout, 0);
-       }
+       CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("s"));
+       CHECK_VAL(io2.out.durable_open_v2, false);
+       CHECK_VAL(io2.out.timeout, 0);
        CHECK_VAL(io2.out.durable_open, false);
 
        /*
@@ -797,15 +744,9 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client2_file3 = io3.out.file.handle;
        CHECK_CREATED(&io3, CREATED, FILE_ATTRIBUTE_ARCHIVE);
-       if (share_is_so) {
-               CHECK_VAL(io3.out.oplock_level, smb2_util_oplock_level("s"));
-               CHECK_VAL(io3.out.durable_open_v2, false);
-               CHECK_VAL(io3.out.timeout, 0);
-       } else {
-               CHECK_VAL(io3.out.oplock_level, smb2_util_oplock_level("b"));
-               CHECK_VAL(io3.out.durable_open_v2, true);
-               CHECK_VAL(io3.out.timeout, io3.in.timeout);
-       }
+       CHECK_VAL(io3.out.oplock_level, smb2_util_oplock_level("b"));
+       CHECK_VAL(io3.out.durable_open_v2, true);
+       CHECK_VAL(io3.out.timeout, io3.in.timeout);
        CHECK_VAL(io3.out.durable_open, false);
        CHECK_VAL(break_info.count, 0);
 
@@ -818,15 +759,9 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client1_file3 = io3.out.file.handle;
        CHECK_CREATED(&io3, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
-       if (share_is_so) {
-               CHECK_VAL(io3.out.oplock_level, smb2_util_oplock_level("s"));
-               CHECK_VAL(io3.out.durable_open_v2, false);
-               CHECK_VAL(io3.out.timeout, 0);
-       } else {
-               CHECK_VAL(io3.out.oplock_level, smb2_util_oplock_level("s"));
-               CHECK_VAL(io3.out.durable_open_v2, false);
-               CHECK_VAL(io3.out.timeout, 0);
-       }
+       CHECK_VAL(io3.out.oplock_level, smb2_util_oplock_level("s"));
+       CHECK_VAL(io3.out.durable_open_v2, false);
+       CHECK_VAL(io3.out.timeout, 0);
        CHECK_VAL(io3.out.durable_open, false);
        CHECK_VAL(break_info.count, 1);
        CHECK_PTR(break_info.received_transport, transport2B);