The branch, master has been updated
via bf6620c5f33 torture: Use two connections in SMB2 sharemode tests
from b336d09b7b1 libcli/smb: harden smbXcli_session_shallow_copy against
nonce reusage
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bf6620c5f33175d06b90f41513a317b54e4f8ec6
Author: Christof Schmitt <[email protected]>
Date: Mon Jun 3 11:51:14 2019 -0700
torture: Use two connections in SMB2 sharemode tests
This allows using the unclist option to specify multiple targets, e.g.
for testing against multiple nodes in a clustered Samba environment.
Signed-off-by: Christof Schmitt <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Wed Jun 12 20:02:26 UTC 2019 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
source4/torture/smb2/sharemode.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/smb2/sharemode.c b/source4/torture/smb2/sharemode.c
index b76aa4ccd7d..c28e6b86dc5 100644
--- a/source4/torture/smb2/sharemode.c
+++ b/source4/torture/smb2/sharemode.c
@@ -468,7 +468,8 @@ struct sharemode_info {
* sharemode, second open with potentially conflicting access.
*/
static bool test_smb2_sharemode_access(struct torture_context *tctx,
- struct smb2_tree *tree)
+ struct smb2_tree *tree1,
+ struct smb2_tree *tree2)
{
const char *fname = "test_sharemode";
NTSTATUS status;
@@ -497,7 +498,7 @@ static bool test_smb2_sharemode_access(struct
torture_context *tctx,
create1.in.create_flags = NTCREATEX_FLAGS_EXTENDED;
create1.in.oplock_level = SMB2_OPLOCK_LEVEL_NONE;
- status = smb2_create(tree, tctx, &create1);
+ status = smb2_create(tree1, tctx, &create1);
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
"CREATE file failed\n");
@@ -516,7 +517,7 @@ static bool test_smb2_sharemode_access(struct
torture_context *tctx,
create2.in.create_flags = NTCREATEX_FLAGS_EXTENDED;
create2.in.oplock_level = SMB2_OPLOCK_LEVEL_NONE;
- status = smb2_create(tree, tctx, &create2);
+ status = smb2_create(tree2, tctx, &create2);
expected_status = info->expect_ok ?
NT_STATUS_OK : NT_STATUS_SHARING_VIOLATION;
torture_assert_ntstatus_equal_goto(tctx, status,
@@ -524,13 +525,13 @@ static bool test_smb2_sharemode_access(struct
torture_context *tctx,
done, "Unexpected status on "
"second create.\n");
- status = smb2_util_close(tree, create1.out.file.handle);
+ status = smb2_util_close(tree1, create1.out.file.handle);
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
"Failed to close "
"first handle.\n");
if (info->expect_ok) {
- status = smb2_util_close(tree, create2.out.file.handle);
+ status = smb2_util_close(tree2,
create2.out.file.handle);
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
"Failed to close "
"second handle.\n");
@@ -538,7 +539,7 @@ static bool test_smb2_sharemode_access(struct
torture_context *tctx,
}
done:
- smb2_util_unlink(tree, fname);
+ smb2_util_unlink(tree1, fname);
return ret;
}
@@ -548,7 +549,8 @@ done:
* sharemode.
*/
static bool test_smb2_access_sharemode(struct torture_context *tctx,
- struct smb2_tree *tree)
+ struct smb2_tree *tree1,
+ struct smb2_tree *tree2)
{
const char *fname = "test_sharemode";
NTSTATUS status;
@@ -578,7 +580,7 @@ static bool test_smb2_access_sharemode(struct
torture_context *tctx,
create1.in.create_flags = NTCREATEX_FLAGS_EXTENDED;
create1.in.oplock_level = SMB2_OPLOCK_LEVEL_NONE;
- status = smb2_create(tree, tctx, &create1);
+ status = smb2_create(tree1, tctx, &create1);
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
"CREATE file failed\n");
@@ -596,7 +598,7 @@ static bool test_smb2_access_sharemode(struct
torture_context *tctx,
create2.in.create_flags = NTCREATEX_FLAGS_EXTENDED;
create2.in.oplock_level = SMB2_OPLOCK_LEVEL_NONE;
- status = smb2_create(tree, tctx, &create2);
+ status = smb2_create(tree2, tctx, &create2);
expected_status = info->expect_ok ?
NT_STATUS_OK : NT_STATUS_SHARING_VIOLATION;
@@ -605,13 +607,13 @@ static bool test_smb2_access_sharemode(struct
torture_context *tctx,
done, "Unexpected status on "
"second create.\n");
- status = smb2_util_close(tree, create1.out.file.handle);
+ status = smb2_util_close(tree1, create1.out.file.handle);
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
"Failed to close "
"first handle.\n");
if (info->expect_ok) {
- status = smb2_util_close(tree, create2.out.file.handle);
+ status = smb2_util_close(tree2,
create2.out.file.handle);
torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
"Failed to close "
"second handle.\n");
@@ -619,7 +621,7 @@ static bool test_smb2_access_sharemode(struct
torture_context *tctx,
}
done:
- smb2_util_unlink(tree, fname);
+ smb2_util_unlink(tree1, fname);
return ret;
}
@@ -627,9 +629,9 @@ struct torture_suite
*torture_smb2_sharemode_init(TALLOC_CTX *ctx)
{
struct torture_suite *suite = torture_suite_create(ctx, "sharemode");
- torture_suite_add_1smb2_test(suite, "sharemode-access",
+ torture_suite_add_2smb2_test(suite, "sharemode-access",
test_smb2_sharemode_access);
- torture_suite_add_1smb2_test(suite, "access-sharemode",
+ torture_suite_add_2smb2_test(suite, "access-sharemode",
test_smb2_access_sharemode);
suite->description = talloc_strdup(suite, "SMB2-SHAREMODE tests");
--
Samba Shared Repository
