RAW-OPLOCK: add BATCH17 test rename on a file with oplock

metze

diff --git a/source/torture/raw/oplock.c b/source/torture/raw/oplock.c
index 2df76ff0fa61b42598bdfc34846212803094f88b..60cf4aa3ae6492dcf9ccd584503483a301d470f0 100644 (file)
--- a/source/torture/raw/oplock.c
+++ b/source/torture/raw/oplock.c
@@ -1798,6 +1798,80 @@ done:
        return ret;
 }
 
        return ret;
 }
 

+static bool test_raw_oplock_batch17(struct torture_context *tctx, struct smbcli_state *cli1, struct smbcli_state *cli2)
+{
+       const char *fname1 = BASEDIR "\\test_batch17_1.dat";
+       const char *fname2 = BASEDIR "\\test_batch17_2.dat";
+       NTSTATUS status;
+       bool ret = true;
+       union smb_open io;
+       union smb_rename rn;
+       uint16_t fnum=0;
+
+       if (!torture_setup_dir(cli1, BASEDIR)) {
+               return false;
+       }
+
+       /* cleanup */
+       smbcli_unlink(cli1->tree, fname1);
+       smbcli_unlink(cli1->tree, fname2);
+
+       smbcli_oplock_handler(cli1->transport, oplock_handler_ack_to_levelII, cli1->tree);
+
+       /*
+         base ntcreatex parms
+       */
+       io.generic.level = RAW_OPEN_NTCREATEX;
+       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
+       io.ntcreatex.in.alloc_size = 0;
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
+       io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN_IF;
+       io.ntcreatex.in.create_options = 0;
+       io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
+       io.ntcreatex.in.security_flags = 0;
+       io.ntcreatex.in.fname = fname1;
+
+       /* we should use no share mode, when samba3 passes this */
+       torture_comment(tctx, "open a file with an batch oplock (share mode: all)\n");
+       ZERO_STRUCT(break_info);
+       io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED |
+               NTCREATEX_FLAGS_REQUEST_OPLOCK |
+               NTCREATEX_FLAGS_REQUEST_BATCH_OPLOCK;
+       io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_READ|
+               NTCREATEX_SHARE_ACCESS_WRITE|
+               NTCREATEX_SHARE_ACCESS_DELETE;
+
+       status = smb_raw_open(cli1->tree, tctx, &io);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
+       fnum = io.ntcreatex.out.file.fnum;
+       CHECK_VAL(io.ntcreatex.out.oplock_level, BATCH_OPLOCK_RETURN);
+
+       torture_comment(tctx, "rename should trigger a break\n");
+       ZERO_STRUCT(rn);
+       rn.generic.level = RAW_RENAME_RENAME;
+       rn.rename.in.pattern1 = fname1;
+       rn.rename.in.pattern2 = fname2;
+       rn.rename.in.attrib = 0;
+
+       printf("trying rename while first file open\n");
+       status = smb_raw_rename(cli2->tree, &rn);
+
+       CHECK_STATUS(tctx, status, NT_STATUS_SHARING_VIOLATION);
+       CHECK_VAL(break_info.count, 1);
+       CHECK_VAL(break_info.failures, 0);
+       CHECK_VAL(break_info.level, OPLOCK_BREAK_TO_LEVEL_II);
+
+       smbcli_close(cli1->tree, fnum);
+
+done:
+       smb_raw_exit(cli1->session);
+       smb_raw_exit(cli2->session);
+       smbcli_deltree(cli1->tree, BASEDIR);
+       return ret;
+}
+

 /* 
    basic testing of oplocks
 */
 /* 
    basic testing of oplocks
 */


@@ -1827,6 +1901,7 @@ struct torture_suite *torture_raw_oplock(TALLOC_CTX *mem_ctx)
        torture_suite_add_2smb_test(suite, "BATCH14", test_raw_oplock_batch14);
        torture_suite_add_2smb_test(suite, "BATCH15", test_raw_oplock_batch15);
        torture_suite_add_2smb_test(suite, "BATCH16", test_raw_oplock_batch16);
        torture_suite_add_2smb_test(suite, "BATCH14", test_raw_oplock_batch14);
        torture_suite_add_2smb_test(suite, "BATCH15", test_raw_oplock_batch15);
        torture_suite_add_2smb_test(suite, "BATCH16", test_raw_oplock_batch16);

+       torture_suite_add_2smb_test(suite, "BATCH17", test_raw_oplock_batch17);

 
        return suite;
 }
 
        return suite;
 }