From: Stefan Metzmacher Date: Thu, 3 Apr 2025 08:40:51 +0000 (+0200) Subject: s4:libcli: remove unused ports from smbcli_socket_connect() X-Git-Tag: tevent-0.17.0~310 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cde54286e35965dc8c0d32bc3d7cc5c80bbff057;p=thirdparty%2Fsamba.git s4:libcli: remove unused ports from smbcli_socket_connect() Signed-off-by: Stefan Metzmacher Reviewed-by: Volker Lendecke --- diff --git a/source4/client/client.c b/source4/client/client.c index 8debb61c6ff..2b96049bb91 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -3277,7 +3277,7 @@ static int do_message_op(const char *netbios_name, const char *desthost, return 1; } - ok = smbcli_socket_connect(cli, server_name, destports, + ok = smbcli_socket_connect(cli, server_name, ev_ctx, resolve_ctx, options, socket_options, &calling, &called); diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c index 9da2f5e7f8d..f9fb18d9faa 100644 --- a/source4/libcli/cliconnect.c +++ b/source4/libcli/cliconnect.c @@ -32,7 +32,6 @@ wrapper around smbcli_sock_connect() */ bool smbcli_socket_connect(struct smbcli_state *cli, const char *server, - const char **ports, struct tevent_context *ev_ctx, struct resolve_context *resolve_ctx, struct smbcli_options *options, diff --git a/source4/libcli/libcli.h b/source4/libcli/libcli.h index 9d2a3240483..27b7c36370e 100644 --- a/source4/libcli/libcli.h +++ b/source4/libcli/libcli.h @@ -87,7 +87,6 @@ ssize_t smbcli_smbwrite(struct smbcli_tree *tree, int fnum, const void *_buf, off_t offset, size_t size1); bool smbcli_socket_connect(struct smbcli_state *cli, const char *server, - const char **ports, struct tevent_context *ev_ctx, struct resolve_context *resolve_ctx, struct smbcli_options *options, diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index fc36e6b441d..8baecf45539 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -54,7 +54,7 @@ static struct smbcli_state *open_nbt_connection(struct torture_context *tctx) lpcfg_smbcli_options(tctx->lp_ctx, &options); - ok = smbcli_socket_connect(cli, host, lpcfg_smb_ports(tctx->lp_ctx), + ok = smbcli_socket_connect(cli, host, tctx->ev, lpcfg_resolve_context(tctx->lp_ctx), &options,