summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-06-04 17:52:13 -0700
committerAndrew Tridgell <tridge@samba.org>2008-06-04 17:52:13 -0700
commitc6cc3cb88ec271da6c372ec881ea66ab8f6e2b68 (patch)
tree93943fb27a5603d610d23b69ad3f937dba147ae9
parent93d6332e7e9fd54518d8209493b3b23301c299db (diff)
downloadsamba-c6cc3cb88ec271da6c372ec881ea66ab8f6e2b68.tar.gz
samba-c6cc3cb88ec271da6c372ec881ea66ab8f6e2b68.tar.bz2
samba-c6cc3cb88ec271da6c372ec881ea66ab8f6e2b68.zip
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)
-rw-r--r--source4/torture/smb2/lock.c6
1 files changed, 1 insertions, 5 deletions
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;