summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-05-20 15:23:51 +0200
committerStefan Metzmacher <metze@samba.org>2009-05-20 15:26:54 +0200
commitd59f84d738401f3ab8ec34aa053af05670a58a89 (patch)
tree0a138c449065428e674fdf1616527f753c164309
parent54973d04221c4f45db1e33e49cfd445c81518f86 (diff)
downloadsamba-d59f84d738401f3ab8ec34aa053af05670a58a89.tar.gz
samba-d59f84d738401f3ab8ec34aa053af05670a58a89.tar.bz2
samba-d59f84d738401f3ab8ec34aa053af05670a58a89.zip
SMB2-LOCK: let the test pass against samba4
metze
-rw-r--r--source4/torture/smb2/lock.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c
index 844309efd4..b97233ef66 100644
--- a/source4/torture/smb2/lock.c
+++ b/source4/torture/smb2/lock.c
@@ -111,9 +111,12 @@ static bool test_valid_request(struct torture_context *torture, struct smb2_tree
status = smb2_lock(tree, &lck);
if (TARGET_IS_WIN7(torture)) {
CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE);
- } else {
+ } else if (TARGET_IS_WINDOWS(torture)) {
CHECK_STATUS(status, NT_STATUS_OK);
+ } else {
+ CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED);
}
+ CHECK_VALUE(lck.out.reserved, 0);
lck.in.reserved = 0x123ab3;
status = smb2_lock(tree, &lck);
@@ -130,9 +133,12 @@ static bool test_valid_request(struct torture_context *torture, struct smb2_tree
status = smb2_lock(tree, &lck);
if (TARGET_IS_WIN7(torture)) {
CHECK_STATUS(status, NT_STATUS_INVALID_LOCK_RANGE);
+ } else if (TARGET_IS_WINDOWS(torture)) {
+ CHECK_STATUS(status, NT_STATUS_OK);
} else {
CHECK_STATUS(status, NT_STATUS_LOCK_NOT_GRANTED);
}
+ CHECK_VALUE(lck.out.reserved, 0);
lck.in.reserved = 0x123ab5;
status = smb2_lock(tree, &lck);