sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

s4:torture/smb2: let us have a common torture_smb2_con_share()

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15346

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit dc5a500f0a)
This commit is contained in:
Stefan Metzmacher 2023-08-07 11:03:41 +02:00 committed by Jule Anger
parent aec49671a3
commit 208bece139
3 changed files with 20 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source4/torture/smb2/acls.c
View File

@ -2139,40 +2139,6 @@ done:
}
#endif
/**
* SMB2 connect with explicit share
**/
static bool torture_smb2_con_share(struct torture_context *tctx,
const char *share,
struct smb2_tree **tree)
{
struct smbcli_options options;
NTSTATUS status;
const char *host = torture_setting_string(tctx, "host", NULL);
lpcfg_smbcli_options(tctx->lp_ctx, &options);
status = smb2_connect_ext(tctx,
host,
lpcfg_smb_ports(tctx->lp_ctx),
share,
lpcfg_resolve_context(tctx->lp_ctx),
samba_cmdline_get_creds(),
0,
tree,
tctx->ev,
&options,
lpcfg_socket_options(tctx->lp_ctx),
lpcfg_gensec_settings(tctx, tctx->lp_ctx)
);
if (!NT_STATUS_IS_OK(status)) {
torture_comment(tctx, "Failed to connect to SMB2 share \\\\%s\\%s - %s\n",
host, share, nt_errstr(status));
return false;
}
return true;
}
static bool test_access_based(struct torture_context *tctx,
struct smb2_tree *tree)
{

29
source4/torture/smb2/util.c
View File

@ -459,22 +459,16 @@ bool torture_smb2_connection(struct torture_context *tctx, struct smb2_tree **tr
/**
* SMB2 connect with share from soption
**/
bool torture_smb2_con_sopt(struct torture_context *tctx,
const char *soption,
struct smb2_tree **tree)
bool torture_smb2_con_share(struct torture_context *tctx,
const char *share,
struct smb2_tree **tree)
{
struct smbcli_options options;
NTSTATUS status;
const char *host = torture_setting_string(tctx, "host", NULL);
const char *share = torture_setting_string(tctx, soption, NULL);
lpcfg_smbcli_options(tctx->lp_ctx, &options);
if (share == NULL) {
torture_comment(tctx, "No share for option %s\n", soption);
return false;
}
status = smb2_connect(tctx,
host,
lpcfg_smb_ports(tctx->lp_ctx),
@ -495,6 +489,23 @@ bool torture_smb2_con_sopt(struct torture_context *tctx,
return true;
}
/**
* SMB2 connect with share from soption
**/
bool torture_smb2_con_sopt(struct torture_context *tctx,
const char *soption,
struct smb2_tree **tree)
{
const char *share = torture_setting_string(tctx, soption, NULL);
if (share == NULL) {
torture_comment(tctx, "No share for option %s\n", soption);
return false;
}
return torture_smb2_con_share(tctx, share, tree);
}
/*
create and return a handle to a test file
with a specific access mask

34
source4/torture/vfs/acl_xattr.c
View File

@ -47,40 +47,6 @@
} \
} while (0)
/**
* SMB2 connect with explicit share
**/
static bool torture_smb2_con_share(struct torture_context *tctx,
const char *share,
struct smb2_tree **tree)
{
struct smbcli_options options;
NTSTATUS status;
const char *host = torture_setting_string(tctx, "host", NULL);
lpcfg_smbcli_options(tctx->lp_ctx, &options);
status = smb2_connect_ext(tctx,
host,
lpcfg_smb_ports(tctx->lp_ctx),
share,
lpcfg_resolve_context(tctx->lp_ctx),
samba_cmdline_get_creds(),
0,
tree,
tctx->ev,
&options,
lpcfg_socket_options(tctx->lp_ctx),
lpcfg_gensec_settings(tctx, tctx->lp_ctx)
);
if (!NT_STATUS_IS_OK(status)) {
printf("Failed to connect to SMB2 share \\\\%s\\%s - %s\n",
host, share, nt_errstr(status));
return false;
}
return true;
}
static bool test_default_acl_posix(struct torture_context *tctx,
struct smb2_tree *tree_unused)
{