diff options
| author | Michael Adam <obnox@samba.org> | 2013-09-25 07:20:30 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-10-05 14:04:07 +0200 |
| commit | a31ea152036fb7750fd071da67e171d16a78474b (patch) | |
| tree | de58f08c80899c141d96f9f5e30ad64f6dab197b /source4/torture/smb2/util.c | |
| parent | 596f802d5d56a446cb911fcb776ce84d6b44ea39 (diff) | |
| download | samba-a31ea152036fb7750fd071da67e171d16a78474b.tar.gz samba-a31ea152036fb7750fd071da67e171d16a78474b.tar.bz2 samba-a31ea152036fb7750fd071da67e171d16a78474b.zip | |
s4:torture:smb2: add smbcli_options argument to torture_smb2_connection_ext()
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source4/torture/smb2/util.c')
| -rw-r--r-- | source4/torture/smb2/util.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c index 4ffcfea1d1..f23708dd32 100644 --- a/source4/torture/smb2/util.c +++ b/source4/torture/smb2/util.c @@ -347,15 +347,13 @@ bool torture_smb2_session_setup(struct torture_context *tctx, */ bool torture_smb2_connection_ext(struct torture_context *tctx, uint64_t previous_session_id, + const struct smbcli_options *options, struct smb2_tree **tree) { NTSTATUS status; const char *host = torture_setting_string(tctx, "host", NULL); const char *share = torture_setting_string(tctx, "share", NULL); struct cli_credentials *credentials = cmdline_credentials; - struct smbcli_options options; - - lpcfg_smbcli_options(tctx->lp_ctx, &options); status = smb2_connect_ext(tctx, host, @@ -366,7 +364,7 @@ bool torture_smb2_connection_ext(struct torture_context *tctx, previous_session_id, tree, tctx->ev, - &options, + options, lpcfg_socket_options(tctx->lp_ctx), lpcfg_gensec_settings(tctx, tctx->lp_ctx) ); @@ -381,8 +379,11 @@ bool torture_smb2_connection_ext(struct torture_context *tctx, bool torture_smb2_connection(struct torture_context *tctx, struct smb2_tree **tree) { bool ret; + struct smbcli_options options; + + lpcfg_smbcli_options(tctx->lp_ctx, &options); - ret = torture_smb2_connection_ext(tctx, 0, tree); + ret = torture_smb2_connection_ext(tctx, 0, &options, tree); return ret; } |