From 65b05090ee4153ffd407e53a076a60706911f0ef Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 7 Aug 2023 11:03:41 +0200 Subject: [PATCH] s4:torture/smb2: let torture_smb2_con_sopt() use smb2_connect() There's no need for smb2_connect_ext(). BUG: https://bugzilla.samba.org/show_bug.cgi?id=15346 Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider (cherry picked from commit ade663ee6ca1a2813b203ea667d933f4dab9e7b7) --- source4/torture/smb2/util.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c index ae6c14ebcbd..01b1b2f0793 100644 --- a/source4/torture/smb2/util.c +++ b/source4/torture/smb2/util.c @@ -475,19 +475,18 @@ bool torture_smb2_con_sopt(struct torture_context *tctx, return false; } - 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) - ); + status = smb2_connect(tctx, + host, + lpcfg_smb_ports(tctx->lp_ctx), + share, + lpcfg_resolve_context(tctx->lp_ctx), + samba_cmdline_get_creds(), + 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)); -- 2.11.4.GIT