From: Stefan Metzmacher Date: Thu, 10 Apr 2025 14:48:48 +0000 (+0200) Subject: s3:libsmb: pass struct loadparm_context to smbsock_connect_send() X-Git-Tag: tevent-0.17.0~232 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=306c2838fb3a3ef5119828cea8d53bb500985bc5;p=thirdparty%2Fsamba.git s3:libsmb: pass struct loadparm_context to smbsock_connect_send() Signed-off-by: Stefan Metzmacher Reviewed-by: Volker Lendecke --- diff --git a/source3/libsmb/smbsock_connect.c b/source3/libsmb/smbsock_connect.c index 53960a7cb5d..473d02ef329 100644 --- a/source3/libsmb/smbsock_connect.c +++ b/source3/libsmb/smbsock_connect.c @@ -397,6 +397,7 @@ static void smbsock_connect_tcp_connected(struct tevent_req *subreq); struct tevent_req *smbsock_connect_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, + struct loadparm_context *lp_ctx, const struct sockaddr_storage *addr, const struct smb_transports *transports, const char *called_name, @@ -767,7 +768,7 @@ NTSTATUS smbsock_connect(const struct sockaddr_storage *addr, if (ev == NULL) { goto fail; } - req = smbsock_connect_send(frame, ev, addr, transports, + req = smbsock_connect_send(frame, ev, lp_ctx, addr, transports, called_name, called_type, calling_name, calling_type); if (req == NULL) { @@ -789,6 +790,7 @@ NTSTATUS smbsock_connect(const struct sockaddr_storage *addr, struct smbsock_any_connect_state { struct tevent_context *ev; + struct loadparm_context *lp_ctx; const struct sockaddr_storage *addrs; const char **called_names; int *called_types; @@ -833,6 +835,7 @@ struct tevent_req *smbsock_any_connect_send(TALLOC_CTX *mem_ctx, return NULL; } state->ev = ev; + state->lp_ctx = lp_ctx; state->addrs = addrs; state->num_addrs = num_addrs; state->called_names = called_names; @@ -927,7 +930,10 @@ static bool smbsock_any_connect_send_next( return false; } subreq = smbsock_connect_send( - state->requests, state->ev, &state->addrs[state->num_sent], + state->requests, + state->ev, + state->lp_ctx, + &state->addrs[state->num_sent], &state->transports, (state->called_names != NULL) ? state->called_names[state->num_sent] : NULL, diff --git a/source3/libsmb/smbsock_connect.h b/source3/libsmb/smbsock_connect.h index 2b473d495f3..7f45f6a08c1 100644 --- a/source3/libsmb/smbsock_connect.h +++ b/source3/libsmb/smbsock_connect.h @@ -26,13 +26,14 @@ struct smb_transports smbsock_transports_from_port(uint16_t port); struct tevent_req *smbsock_connect_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, + struct loadparm_context *lp_ctx, const struct sockaddr_storage *addr, const struct smb_transports *transports, const char *called_name, int called_type, const char *calling_name, int calling_type) - NONNULL(2) NONNULL(3) NONNULL(4); + NONNULL(2) NONNULL(3) NONNULL(4) NONNULL(5); NTSTATUS smbsock_connect_recv(struct tevent_req *req, int *sock, uint16_t *ret_port); NTSTATUS smbsock_connect(const struct sockaddr_storage *addr,