[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1256-gb200795

[Jeremy Allison]

The branch, v4-0-test has been updated
       via  b2007956aa4534f22ad7fd85b0aee0be769548ae (commit)
      from  6dc280731d071681b635a2f091be2b153a902080 (commit)

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


- Log -----------------------------------------------------------------
commit b2007956aa4534f22ad7fd85b0aee0be769548ae
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Mar 11 12:37:20 2008 -0700

    Samba3 now passes the test_raw_oplock_exclusive3 test.
    Jeremy.

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

Summary of changes:
 source/torture/raw/oplock.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/torture/raw/oplock.c b/source/torture/raw/oplock.c
index d1ae8fc..7571a80 100644
--- a/source/torture/raw/oplock.c
+++ b/source/torture/raw/oplock.c
@@ -363,7 +363,6 @@ static bool test_raw_oplock_exclusive3(struct torture_context *tctx, struct smbc
 	union smb_open io;
 	union smb_setfileinfo sfi;
 	uint16_t fnum=0;
-	bool s3 = torture_setting_bool(tctx, "samba3", false);
 
 	if (!torture_setup_dir(cli1, BASEDIR)) {
 		return false;
@@ -389,15 +388,10 @@ static bool test_raw_oplock_exclusive3(struct torture_context *tctx, struct smbc
 	io.ntcreatex.in.security_flags = 0;
 	io.ntcreatex.in.fname = fname;
 
-	torture_comment(tctx, "open a file with an exclusive oplock (share mode: %s)\n",
-			s3?"all":"none");
+	torture_comment(tctx, "open a file with an exclusive oplock (share mode: none)\n");
+
 	ZERO_STRUCT(break_info);
 	io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED | NTCREATEX_FLAGS_REQUEST_OPLOCK;
-	if (s3) {
-		io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_READ|
-			NTCREATEX_SHARE_ACCESS_WRITE|
-			NTCREATEX_SHARE_ACCESS_DELETE;
-	}
 
 	status = smb_raw_open(cli1->tree, tctx, &io);
 	CHECK_STATUS(tctx, status, NT_STATUS_OK);


-- 
Samba Shared Repository