Revert "check smb2 batch9 NTCREATEX_DISP_OPEN_IF vs. NTCREATEX_DISP_CREATE"
authorStefan Metzmacher <metze@samba.org>
Fri, 7 Nov 2014 15:20:21 +0000 (16:20 +0100)
committerStefan Metzmacher <metze@samba.org>
Tue, 28 Jan 2020 12:26:51 +0000 (13:26 +0100)
This reverts commit 030b2fe7f37be48b48823f2645d3404f254737ae.

source4/torture/smb2/oplock.c

index d39b904cc7cddfa30b642bf08eb2c38155db1206..30bbd92e7ec3f3ac215a7d84e65321dd5774f285 100644 (file)
@@ -1491,11 +1491,9 @@ static bool test_smb2_oplock_batch9(struct torture_context *tctx,
                                SEC_FILE_WRITE_ATTRIBUTE |
                                SEC_STD_SYNCHRONIZE;
        io.smb2.in.create_disposition = NTCREATEX_DISP_CREATE;
-       io.smb2.in.create_disposition = NTCREATEX_DISP_OPEN_IF;
        status = smb2_create(tree1, tctx, &(io.smb2));
        torture_assert_ntstatus_ok(tctx, status, "Error opening the file");
        h1 = io.smb2.out.file.handle;
-       CHECK_VAL(io.smb2.out.create_action, FILE_WAS_CREATED);
        CHECK_VAL(io.smb2.out.oplock_level, SMB2_OPLOCK_LEVEL_BATCH);
 
        torture_comment(tctx, "Subsequent normal open should break oplock on "
@@ -1507,7 +1505,6 @@ static bool test_smb2_oplock_batch9(struct torture_context *tctx,
        io.smb2.in.oplock_level = SMB2_OPLOCK_LEVEL_BATCH;
        io.smb2.in.desired_access = SEC_RIGHTS_FILE_ALL;
        io.smb2.in.create_disposition = NTCREATEX_DISP_OPEN;
-       io.smb2.in.create_disposition = NTCREATEX_DISP_OPEN_IF;
        status = smb2_create(tree2, tctx, &(io.smb2));
        torture_assert_ntstatus_ok(tctx, status, "Incorrect status");
        h2 = io.smb2.out.file.handle;
@@ -1516,7 +1513,6 @@ static bool test_smb2_oplock_batch9(struct torture_context *tctx,
        CHECK_VAL(break_info.handle.data[0], h1.data[0]);
        CHECK_VAL(break_info.failures, 0);
        CHECK_VAL(break_info.level, SMB2_OPLOCK_LEVEL_II);
-       CHECK_VAL(io.smb2.out.create_action, FILE_WAS_OPENED);
        CHECK_VAL(io.smb2.out.oplock_level, SMB2_OPLOCK_LEVEL_II);
        smb2_util_close(tree2, h2);