The branch, master has been updated
via df5f962 s4:torture:smb2: fix error reporting in the oplock-brl3 test
via 439c907 s4:torture:smb2: fix error reporting in the oplock-brl2 test
via e9df135 s4:torture:smb2: fix error reporting in the oplock-brl1 test
via c960e55 s4:torture:smb2: remove an unused variable from the
oplock-exclusive2 test
via 7c6f1fb s4:torture:smb2: remove an unused variable from the
oplock-exclusive1 test
from 7c1fd74 At Michael's suggestion, factor common code into a
function. My bad :-).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit df5f962c60bb273c4759334ed6cc490d2a91d5ba
Author: Michael Adam <[email protected]>
Date: Tue Sep 11 16:28:45 2012 +0200
s4:torture:smb2: fix error reporting in the oplock-brl3 test
(Error was set to an unused variable)
Autobuild-User(master): Michael Adam <[email protected]>
Autobuild-Date(master): Tue Sep 11 22:09:18 CEST 2012 on sn-devel-104
commit 439c907f6b2b02fefa5f1913cbbb8ce971d2611a
Author: Michael Adam <[email protected]>
Date: Tue Sep 11 16:28:15 2012 +0200
s4:torture:smb2: fix error reporting in the oplock-brl2 test
(Error was set to an unused variable)
commit e9df135ca52e07af1539cf15e6339d30ae525225
Author: Michael Adam <[email protected]>
Date: Tue Sep 11 16:27:19 2012 +0200
s4:torture:smb2: fix error reporting in the oplock-brl1 test
(Error was set to an unused variable)
commit c960e55fbfbc12f85447af04778a7ac5888d499d
Author: Michael Adam <[email protected]>
Date: Tue Sep 11 16:26:44 2012 +0200
s4:torture:smb2: remove an unused variable from the oplock-exclusive2 test
commit 7c6f1fb294635f25e5e70592f37871902c7525ca
Author: Michael Adam <[email protected]>
Date: Tue Sep 11 16:25:50 2012 +0200
s4:torture:smb2: remove an unused variable from the oplock-exclusive1 test
-----------------------------------------------------------------------
Summary of changes:
source4/torture/smb2/oplock.c | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c
index d489943..fc939cc 100644
--- a/source4/torture/smb2/oplock.c
+++ b/source4/torture/smb2/oplock.c
@@ -364,7 +364,6 @@ static bool test_smb2_oplock_exclusive1(struct
torture_context *tctx,
NTSTATUS status;
bool ret = true;
union smb_open io;
- union smb_unlink unl;
struct smb2_handle h1;
struct smb2_handle h;
@@ -411,8 +410,6 @@ static bool test_smb2_oplock_exclusive1(struct
torture_context *tctx,
CHECK_VAL(break_info.failures, 0);
torture_comment(tctx, "unlink it - should also be no break\n");
- unl.unlink.in.pattern = fname;
- unl.unlink.in.attrib = 0;
status = smb2_util_unlink(tree2, fname);
torture_assert_ntstatus_equal(tctx, status, NT_STATUS_SHARING_VIOLATION,
"Incorrect status");
@@ -435,7 +432,6 @@ static bool test_smb2_oplock_exclusive2(struct
torture_context *tctx,
NTSTATUS status;
bool ret = true;
union smb_open io;
- union smb_unlink unl;
struct smb2_handle h, h1, h2;
status = torture_smb2_testdir(tree1, BASEDIR, &h);
@@ -490,8 +486,6 @@ static bool test_smb2_oplock_exclusive2(struct
torture_context *tctx,
/* now we have 2 level II oplocks... */
torture_comment(tctx, "try to unlink it - should cause a break\n");
- unl.unlink.in.pattern = fname;
- unl.unlink.in.attrib = 0;
status = smb2_util_unlink(tree2, fname);
torture_assert_ntstatus_ok(tctx, status, "Error unlinking the file");
torture_wait_for_oplock_break(tctx);
@@ -2973,7 +2967,6 @@ static bool test_smb2_oplock_brl1(struct torture_context
*tctx,
/*int fname, f;*/
bool ret = true;
uint8_t buf[1000];
- bool correct = true;
union smb_open io;
NTSTATUS status;
struct smb2_lock lck;
@@ -3025,7 +3018,7 @@ static bool test_smb2_oplock_brl1(struct torture_context
*tctx,
status = smb2_util_write(tree1, h1,buf, 0, sizeof(buf));
if (!NT_STATUS_EQUAL(status, NT_STATUS_OK)) {
torture_comment(tctx, "Failed to create file\n");
- correct = false;
+ ret = false;
goto done;
}
@@ -3096,7 +3089,6 @@ static bool test_smb2_oplock_brl2(struct torture_context
*tctx, struct smb2_tree
/*int fname, f;*/
bool ret = true;
uint8_t buf[1000];
- bool correct = true;
union smb_open io;
NTSTATUS status;
struct smb2_handle h, h1;
@@ -3148,7 +3140,7 @@ static bool test_smb2_oplock_brl2(struct torture_context
*tctx, struct smb2_tree
status = smb2_util_write(tree1, h1, buf, 0, sizeof(buf));
if (!NT_STATUS_EQUAL(status, NT_STATUS_OK)) {
torture_comment(tctx, "Failed to create file\n");
- correct = false;
+ ret = false;
goto done;
}
@@ -3198,7 +3190,6 @@ static bool test_smb2_oplock_brl3(struct torture_context
*tctx, struct smb2_tree
const char *fname = BASEDIR "\\test_batch_brl.dat";
bool ret = true;
uint8_t buf[1000];
- bool correct = true;
union smb_open io;
NTSTATUS status;
struct smb2_handle h, h1, h2;
@@ -3249,7 +3240,7 @@ static bool test_smb2_oplock_brl3(struct torture_context
*tctx, struct smb2_tree
if (!NT_STATUS_EQUAL(status, NT_STATUS_OK)) {
torture_comment(tctx, "Failed to create file\n");
- correct = false;
+ ret = false;
goto done;
}
--
Samba Shared Repository
