[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1713-gd59f84d

[Stefan Metzmacher]

The branch, master has been updated
       via  d59f84d738401f3ab8ec34aa053af05670a58a89 (commit)
      from  54973d04221c4f45db1e33e49cfd445c81518f86 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d59f84d738401f3ab8ec34aa053af05670a58a89
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed May 20 15:23:51 2009 +0200

    SMB2-LOCK: let the test pass against samba4
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source4/torture/smb2/lock.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

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


-- 
Samba Shared Repository