From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 20 May 2009 13:23:51 +0000 (+0200)
Subject: SMB2-LOCK: let the test pass against samba4
X-Git-Tag: tdb-1.1.5~460
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d59f84d738401f3ab8ec34aa053af05670a58a89;p=thirdparty%2Fsamba.git

SMB2-LOCK: let the test pass against samba4

metze
---

diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c
index 844309efd4c..b97233ef661 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);