[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha4-36-gc014ffa

Andrew Tridgell tridge at samba.org
Thu Jun 5 00:52:53 GMT 2008


The branch, v4-0-test has been updated
       via  c014ffabc65c30a6b83c8f9f9f9a80bb79333f59 (commit)
      from  d4d4d62939e325f8529b11fcd2d490e8f63293b0 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit c014ffabc65c30a6b83c8f9f9f9a80bb79333f59
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Jun 4 17:52:13 2008 -0700

    another SMB2-LOCK fix now that we know that the UNLOCK flag is only
    honoured on the first lock in a set

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

Summary of changes:
 source/torture/smb2/lock.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/torture/smb2/lock.c b/source/torture/smb2/lock.c
index 1b08efc..d820983 100644
--- a/source/torture/smb2/lock.c
+++ b/source/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;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list