s4-torture: make sure we always require batch oplocks

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 351633cd31c525abd4f95d46f5c76d0d4554f3d1..7961857473fa97ff01c3bb4e0ba52b510740c12c 100644 (file)
--- a/source4/torture/smb2/multichannel.c
+++ b/source4/torture/smb2/multichannel.c
@@ -469,6 +469,7 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
 
        torture_comment(tctx, "client1 opens fname1 via session 1\n");
 
+       io1.in.oplock_level = smb2_util_oplock_level("b");
        status = smb2_create(tree1, mem_ctx, &io1);
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client1_file1 = io1.out.file.handle;
@@ -490,6 +491,7 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
 
        torture_comment(tctx, "client1 opens fname2 via session 1\n");
 
+       io2.in.oplock_level = smb2_util_oplock_level("b");
        status = smb2_create(tree1, mem_ctx, &io2);
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client1_file2 = io2.out.file.handle;
@@ -576,6 +578,7 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
 
        /* 2a opens file1 */
 
+       io1.in.oplock_level = smb2_util_oplock_level("b");
        status = smb2_create(tree2A, mem_ctx, &io1);
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client2_file1 = io1.out.file.handle;
@@ -591,6 +594,7 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
        torture_comment(tctx, "client2 opens fname2 via session 2B\n");
 
        /* 2b opens file2 */
+       io2.in.oplock_level = smb2_util_oplock_level("b");
        status = smb2_create(tree2B, mem_ctx, &io2);
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client2_file2 = io2.out.file.handle;
@@ -610,6 +614,7 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
 
        torture_comment(tctx, "client1 opens fname1 via session 1\n");
 
+       io1.in.oplock_level = smb2_util_oplock_level("b");
        status = smb2_create(tree1, mem_ctx, &io1);
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client1_file1 = io1.out.file.handle;
@@ -635,6 +640,7 @@ static bool test_multichannel_oplock_break(struct torture_context *tctx,
 
        torture_comment(tctx, "client1 opens fname2 via session 1\n");
 
+       io2.in.oplock_level = smb2_util_oplock_level("b");
        status = smb2_create(tree1, mem_ctx, &io2);
        CHECK_STATUS(status, NT_STATUS_OK);
        h_client1_file2 = io2.out.file.handle;