From 2bc8f45c2f0eb142f7383d86cd3dfe32a521fa4f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 10 Apr 2025 16:48:48 +0200 Subject: [PATCH] s4:libcli: pass struct loadparm_context to smbcli_sock_connect_send() Signed-off-by: Stefan Metzmacher Reviewed-by: Volker Lendecke --- source4/libcli/raw/clisocket.c | 3 ++- source4/libcli/smb2/connect.c | 2 +- source4/libcli/smb_composite/connect.c | 1 + source4/libcli/smb_composite/connect_nego.c | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c index 16406393a8e..ea2b3bfb312 100644 --- a/source4/libcli/raw/clisocket.c +++ b/source4/libcli/raw/clisocket.c @@ -321,6 +321,7 @@ struct composite_context *smbcli_sock_connect_send(TALLOC_CTX *mem_ctx, const char *host_addr, const struct smbcli_options *options, const char *host_name, + struct loadparm_context *lp_ctx, struct resolve_context *resolve_ctx, struct tevent_context *event_ctx, const char *socket_options, @@ -487,7 +488,7 @@ NTSTATUS smbcli_sock_connect(TALLOC_CTX *mem_ctx, { struct composite_context *c = smbcli_sock_connect_send(mem_ctx, host_addr, options, - host_name, resolve_ctx, + host_name, lp_ctx, resolve_ctx, event_ctx, socket_options, calling, called); return smbcli_sock_connect_recv(c, mem_ctx, result); diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c index 8e18c85a4a4..b1c2b56a3e0 100644 --- a/source4/libcli/smb2/connect.c +++ b/source4/libcli/smb2/connect.c @@ -131,7 +131,7 @@ struct tevent_req *smb2_connect_send(TALLOC_CTX *mem_ctx, } creq = smbcli_sock_connect_send(state, NULL, &state->options, - state->host, state->resolve_ctx, + state->host, lp_ctx, state->resolve_ctx, state->ev, state->socket_options, &state->calling, &state->called); diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c index 92bd99f419f..dff5d9cb5db 100644 --- a/source4/libcli/smb_composite/connect.c +++ b/source4/libcli/smb_composite/connect.c @@ -477,6 +477,7 @@ struct composite_context *smb_composite_connect_send(struct smb_composite_connec NULL, &io->in.options, io->in.dest_host, + lp_ctx, resolve_ctx, c->event_ctx, io->in.socket_options, &state->calling, diff --git a/source4/libcli/smb_composite/connect_nego.c b/source4/libcli/smb_composite/connect_nego.c index 9364e2ade09..4e55dae7033 100644 --- a/source4/libcli/smb_composite/connect_nego.c +++ b/source4/libcli/smb_composite/connect_nego.c @@ -84,6 +84,7 @@ struct tevent_req *smb_connect_nego_send(TALLOC_CTX *mem_ctx, state->dest_address, &state->options, state->dest_hostname, + lp_ctx, state->resolve_ctx, state->ev, state->socket_options, -- 2.47.3