diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-28 13:42:29 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-28 13:42:29 +1000 |
| commit | 0f2d8eacf5217b04c88420513a1a1f52e374d659 (patch) | |
| tree | 0bfa7b93a0ba286db7839279ddb1f1279e658131 /source4/torture/smb2/lock.c | |
| parent | baa2dffdf34c2f3aa150695c60742d616eeb3b09 (diff) | |
| parent | bb264d3a1f212be7eca4b38e61db19de8a26e158 (diff) | |
| download | samba-0f2d8eacf5217b04c88420513a1a1f52e374d659.tar.gz samba-0f2d8eacf5217b04c88420513a1a1f52e374d659.tar.bz2 samba-0f2d8eacf5217b04c88420513a1a1f52e374d659.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 3038dd8a4ffae4113f49547a9d4d6b1c8c46397a)
Diffstat (limited to 'source4/torture/smb2/lock.c')
| -rw-r--r-- | source4/torture/smb2/lock.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c index 4e21045a33..5a36ac3eae 100644 --- a/source4/torture/smb2/lock.c +++ b/source4/torture/smb2/lock.c @@ -252,12 +252,20 @@ 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); - CHECK_STATUS(status, NT_STATUS_OK); + if (torture_setting_bool(torture, "windows", false)) { + CHECK_STATUS(status, NT_STATUS_RANGE_NOT_LOCKED); + } else { + CHECK_STATUS(status, NT_STATUS_OK); + } lck.in.lock_count = 1; el[0].flags = SMB2_LOCK_FLAG_UNLOCK; status = smb2_lock(tree, &lck); - CHECK_STATUS(status, NT_STATUS_OK); + if (torture_setting_bool(torture, "windows", false)) { + CHECK_STATUS(status, NT_STATUS_RANGE_NOT_LOCKED); + } else { + CHECK_STATUS(status, NT_STATUS_OK); + } lck.in.lock_count = 1; el[0].flags = SMB2_LOCK_FLAG_UNLOCK; |