s4:libcli: remove unused ports from smbcli_socket_connect()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source4/client/client.c b/source4/client/client.c
index 8debb61c6ff8bd2b541cd221bb99ecb707736b8d..2b96049bb91d9b9fde7ff46084dcfe2805aa9415 100644 (file)
--- 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 9da2f5e7f8d27b2f7b1298a5cd3e32abe1b2fce8..f9fb18d9faa3f5c72bdb5eb3da710eaa3c48c6e4 100644 (file)
--- 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 9d2a32404834cb3703e9e9f3ca016df343335948..27b7c36370e3d1ef4fe71e1f708f59f5cca92905 100644 (file)
--- 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 fc36e6b441dd75b08fdde7b0038d93da9ff1b4f5..8baecf4553913254d355392f60f8c479abcb89fd 100644 (file)
--- 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,