From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 3 Apr 2025 06:44:24 +0000 (+0200)
Subject: s4:libcli: remove unused ports argument from smb2_connect_send
X-Git-Tag: tevent-0.17.0~318
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f7e8aa35e49245c04afebb37942bbc2fee2687f;p=thirdparty%2Fsamba.git

s4:libcli: remove unused ports argument from smb2_connect_send

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

diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c
index 6697051d61d..ba2973e1f7a 100644
--- a/source4/libcli/smb2/connect.c
+++ b/source4/libcli/smb2/connect.c
@@ -42,7 +42,6 @@ struct smb2_connect_state {
 	const char *host;
 	const char *share;
 	const char *unc;
-	const char **ports;
 	const char *socket_options;
 	struct nbt_name calling, called;
 	struct gensec_settings *gensec_settings;
@@ -62,7 +61,6 @@ static void smb2_connect_socket_done(struct composite_context *creq);
 struct tevent_req *smb2_connect_send(TALLOC_CTX *mem_ctx,
 				     struct tevent_context *ev,
 				     const char *host,
-				     const char **ports,
 				     const char *share,
 				     struct resolve_context *resolve_ctx,
 				     struct cli_credentials *credentials,
@@ -76,7 +74,6 @@ struct tevent_req *smb2_connect_send(TALLOC_CTX *mem_ctx,
 	struct tevent_req *req;
 	struct smb2_connect_state *state;
 	struct composite_context *creq;
-	static const char *default_ports[] = { "445", "139", NULL };
 	enum smb_encryption_setting encryption_state =
 		cli_credentials_get_smb_encryption(credentials);
 
@@ -92,16 +89,11 @@ struct tevent_req *smb2_connect_send(TALLOC_CTX *mem_ctx,
 	state->previous_session_id = previous_session_id;
 	state->options = *options;
 	state->host = host;
-	state->ports = ports;
 	state->share = share;
 	state->resolve_ctx = resolve_ctx;
 	state->socket_options = socket_options;
 	state->gensec_settings = gensec_settings;
 
-	if (state->ports == NULL) {
-		state->ports = default_ports;
-	}
-
 	if (encryption_state >= SMB_ENCRYPTION_DESIRED) {
 		state->options.signing = SMB_SIGNING_REQUIRED;
 	}
@@ -425,7 +417,6 @@ NTSTATUS smb2_connect_ext(TALLOC_CTX *mem_ctx,
 	subreq = smb2_connect_send(frame,
 				   ev,
 				   host,
-				   ports,
 				   share,
 				   resolve_ctx,
 				   credentials,
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index ae9675385b1..a7a12e3c674 100644
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -276,7 +276,6 @@ static void continue_smbXcli_connect(struct tevent_req *subreq)
 		 */
 		subreq = smb2_connect_send(s, c->event_ctx,
 				conn->in.dest_host,
-				conn->in.dest_ports,
 				conn->in.service,
 				s->io.resolve_ctx,
 				conn->in.credentials,