another SMB2-LOCK fix now that we know that the UNLOCK flag is only
authorAndrew Tridgell <tridge@samba.org>
Thu, 5 Jun 2008 00:52:13 +0000 (17:52 -0700)
committerAndrew Tridgell <tridge@samba.org>
Thu, 5 Jun 2008 00:52:13 +0000 (17:52 -0700)
honoured on the first lock in a set
(This used to be commit c014ffabc65c30a6b83c8f9f9f9a80bb79333f59)

source4/torture/smb2/lock.c

index 1b08efc0fa4967b74a392e86ad83adae47725bbd..d820983022b35cf01e8f931cf533992ee524abde 100644 (file)
@@ -273,11 +273,7 @@ static bool test_valid_request(struct torture_context *torture, struct smb2_tree
        lck.in.lock_count       = 1;
        el[0].flags             = SMB2_LOCK_FLAG_UNLOCK;
        status = smb2_lock(tree, &lck);
-       if (torture_setting_bool(torture, "windows", false)) {
-               CHECK_STATUS(status, NT_STATUS_RANGE_NOT_LOCKED);
-       } else {
-               CHECK_STATUS(status, NT_STATUS_OK);
-       }
+       CHECK_STATUS(status, NT_STATUS_RANGE_NOT_LOCKED);
 
        lck.in.lock_count       = 1;
        el[0].flags             = SMB2_LOCK_FLAG_UNLOCK;