summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-03-11 12:37:20 -0700
committerJeremy Allison <jra@samba.org>2008-03-11 12:37:20 -0700
commitfe3316431e157f6fe5fc1092927d1d03f29b9bbd (patch)
tree27d16a32f852e550eb14a54773c0e2a7963350d6
parent8e70dc7e9a1c88a4766b92ec61cbe7ba6f7dcd7f (diff)
downloadsamba-fe3316431e157f6fe5fc1092927d1d03f29b9bbd.tar.gz
samba-fe3316431e157f6fe5fc1092927d1d03f29b9bbd.tar.bz2
samba-fe3316431e157f6fe5fc1092927d1d03f29b9bbd.zip
Samba3 now passes the test_raw_oplock_exclusive3 test.
Jeremy. (This used to be commit b2007956aa4534f22ad7fd85b0aee0be769548ae)
-rw-r--r--source4/torture/raw/oplock.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index d1ae8fced5..7571a8006c 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/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);