s4:libcli: remove unused dest_ports from struct smb_composite_connect

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

diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c
index cf32ad2fa84bfda11a3f59c78a3e549a1644c5aa..362223c45b1951dfaaa03d60bb314fd6ea2a19ee 100644 (file)
--- a/source4/libcli/raw/clitree.c
+++ b/source4/libcli/raw/clitree.c
@@ -202,7 +202,6 @@ NTSTATUS smbcli_tree_full_connection(TALLOC_CTX *parent_ctx,
        }
 
        io.in.dest_host = dest_host;
-       io.in.dest_ports = dest_ports;
        io.in.socket_options = socket_options;
        io.in.called_name = strupper_talloc(tmp_ctx, dest_host);
        io.in.service = service;

diff --git a/source4/libcli/smb_composite/fetchfile.c b/source4/libcli/smb_composite/fetchfile.c
index 30e3a626ce677c161375c74dfec5fc649887ad6f..527f1a852ce1a804cf41abf52b495e1266cd87db 100644 (file)
--- a/source4/libcli/smb_composite/fetchfile.c
+++ b/source4/libcli/smb_composite/fetchfile.c
@@ -140,7 +140,6 @@ struct composite_context *smb_composite_fetchfile_send(struct smb_composite_fetc
        state->io = io;
 
        state->connect->in.dest_host    = io->in.dest_host;
-       state->connect->in.dest_ports   = io->in.ports;
        state->connect->in.socket_options = io->in.socket_options;
        state->connect->in.called_name  = io->in.called_name;
        state->connect->in.service      = io->in.service;

diff --git a/source4/libcli/smb_composite/fsinfo.c b/source4/libcli/smb_composite/fsinfo.c
index 64bf4c84e66c95f992728cbad65adf615381bef5..215018fd1a006d89bec06feb805ec9be49ca9529 100644 (file)
--- a/source4/libcli/smb_composite/fsinfo.c
+++ b/source4/libcli/smb_composite/fsinfo.c
@@ -149,7 +149,6 @@ struct composite_context *smb_composite_fsinfo_send(struct smbcli_tree *tree,
        if (state->connect == NULL) goto failed;
 
        state->connect->in.dest_host    = io->in.dest_host;
-       state->connect->in.dest_ports   = io->in.dest_ports;
        state->connect->in.socket_options = io->in.socket_options;
        state->connect->in.called_name  = io->in.called_name;
        state->connect->in.service      = io->in.service;

diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h
index 1b507fd8c374c5acbed665aeb916fd8c525b79ac..3a2ac9e0c1d72b346cb8240695268f815211c131 100644 (file)
--- a/source4/libcli/smb_composite/smb_composite.h
+++ b/source4/libcli/smb_composite/smb_composite.h
@@ -134,7 +134,6 @@ NTSTATUS smb_connect_nego_recv(struct tevent_req *req,
 struct smb_composite_connect {
        struct {
                const char *dest_host;
-               const char **dest_ports;
                const char *socket_options;
                const char *called_name;
                const char *service;

diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index a7a12e3c6745d7dc33ff12680c63a3bb1834eda4..5d25db77f0bcca47ae1b3d1221765298e7605dd7 100644 (file)
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -170,7 +170,6 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb_send(TALLOC_CT
           remote rpc server */
        target_hostname = dcerpc_binding_get_string_option(s->io.binding, "target_hostname");
        conn->in.dest_host = dcerpc_binding_get_string_option(s->io.binding, "host");
-       conn->in.dest_ports = lpcfg_smb_ports(lp_ctx);
        conn->in.called_name = target_hostname;
        if (conn->in.called_name == NULL) {
                conn->in.called_name = "*SMBSERVER";

diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index 121ff57f22b15f7f1a3c60508df8a30a6626046f..a749ee5fc306c1d5aaf671cf6b30096328355325 100644 (file)
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -287,7 +287,6 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs,
 
        /* connect to the server, using the smbd event context */
        io.in.dest_host = host;
-       io.in.dest_ports = lpcfg_smb_ports(ntvfs->ctx->lp_ctx);
        io.in.socket_options = lpcfg_socket_options(ntvfs->ctx->lp_ctx);
        io.in.called_name = host;
        io.in.existing_conn = NULL;

diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index 4f2d74c41a823749b418f49c8912e7b5cfb3c336..8a066b4b435f4a7983ab09bf18a4b440436f5bf8 100644 (file)
--- a/source4/torture/basic/misc.c
+++ b/source4/torture/basic/misc.c
@@ -871,7 +871,6 @@ static struct composite_context *torture_connect_async(
        torture_comment(tctx, "Open Connection to %s/%s\n",host,share);
        smb->in.dest_host=talloc_strdup(mem_ctx,host);
        smb->in.service=talloc_strdup(mem_ctx,share);
-       smb->in.dest_ports=lpcfg_smb_ports(tctx->lp_ctx);
        smb->in.socket_options = lpcfg_socket_options(tctx->lp_ctx);
        smb->in.called_name = strupper_talloc(mem_ctx, host);
        smb->in.service_type=NULL;

diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c
index 5d0e4e790ca69c5e900095ac38f3a223fb74d9a0..b226eb07d0c40c34a36051a7db4e3d70c311b457 100644 (file)
--- a/source4/torture/raw/lockbench.c
+++ b/source4/torture/raw/lockbench.c
@@ -189,7 +189,6 @@ static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te
        }
 
        io->in.dest_host    = state->dest_host;
-       io->in.dest_ports   = state->dest_ports;
        io->in.gensec_settings = lpcfg_gensec_settings(state->mem_ctx, state->tctx->lp_ctx);
        io->in.socket_options = lpcfg_socket_options(state->tctx->lp_ctx);
        io->in.called_name  = state->called_name;

diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c
index 7c9b0617173761771899b6cd03b08140ecf87084..fea22f530db449b1de753407efcfdb44ddcdaff4 100644 (file)
--- a/source4/torture/raw/openbench.c
+++ b/source4/torture/raw/openbench.c
@@ -132,7 +132,6 @@ static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te
        }
 
        io->in.dest_host    = state->dest_host;
-       io->in.dest_ports   = state->dest_ports;
        io->in.socket_options = lpcfg_socket_options(state->tctx->lp_ctx);
        io->in.called_name  = state->called_name;
        io->in.service      = share;