From c6cc3cb88ec271da6c372ec881ea66ab8f6e2b68 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 4 Jun 2008 17:52:13 -0700 Subject: another SMB2-LOCK fix now that we know that the UNLOCK flag is only honoured on the first lock in a set (This used to be commit c014ffabc65c30a6b83c8f9f9f9a80bb79333f59) --- source4/torture/smb2/lock.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'source4') diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c index 1b08efc0fa..d820983022 100644 --- a/source4/torture/smb2/lock.c +++ b/source4/torture/smb2/lock.c @@ -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; -- cgit