s3:libsmb: pass struct loadparm_context to smbsock_connect()

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

diff --git a/source3/libsmb/smbsock_connect.c b/source3/libsmb/smbsock_connect.c
index f000f8fe61d09e7eb29be9b7297025c772d70053..53960a7cb5d01bad1204141145e967a48e2a508c 100644 (file)
--- a/source3/libsmb/smbsock_connect.c
+++ b/source3/libsmb/smbsock_connect.c
@@ -752,6 +752,7 @@ NTSTATUS smbsock_connect_recv(struct tevent_req *req, int *sock,
 }
 
 NTSTATUS smbsock_connect(const struct sockaddr_storage *addr,
+                        struct loadparm_context *lp_ctx,
                         const struct smb_transports *transports,
                         const char *called_name, int called_type,
                         const char *calling_name, int calling_type,

diff --git a/source3/libsmb/smbsock_connect.h b/source3/libsmb/smbsock_connect.h
index 2449fb5e8445994109745d2d245ba87334df2089..2b473d495f3db5b3784776793132d02491b76b4f 100644 (file)
--- a/source3/libsmb/smbsock_connect.h
+++ b/source3/libsmb/smbsock_connect.h
@@ -36,11 +36,12 @@ struct tevent_req *smbsock_connect_send(TALLOC_CTX *mem_ctx,
 NTSTATUS smbsock_connect_recv(struct tevent_req *req, int *sock,
                              uint16_t *ret_port);
 NTSTATUS smbsock_connect(const struct sockaddr_storage *addr,
+                        struct loadparm_context *lp_ctx,
                         const struct smb_transports *transports,
                         const char *called_name, int called_type,
                         const char *calling_name, int calling_type,
                         int *pfd, uint16_t *ret_port, int sec_timeout)
-       NONNULL(1) NONNULL(2) NONNULL(7);
+       NONNULL(1) NONNULL(2) NONNULL(3) NONNULL(8);
 
 struct tevent_req *smbsock_any_connect_send(TALLOC_CTX *mem_ctx,
                                            struct tevent_context *ev,

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 6d90f691b66c6a2166c68d07a8873fcc5d3376f4..9231a818407bfeffefa2af8a8702fd8ea81bc806 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1444,6 +1444,7 @@ static bool connect_preferred_dc(TALLOC_CTX *mem_ctx,
        struct smb_transports ts =
                smb_transports_parse("client smb transports",
                        lp_client_smb_transports());
+       struct loadparm_context *lp_ctx = NULL;
        NTSTATUS status;
        bool ok;
 
@@ -1511,7 +1512,13 @@ static bool connect_preferred_dc(TALLOC_CTX *mem_ctx,
                return false;
        }
 
-       status = smbsock_connect(&domain->dcaddr, &ts,
+       lp_ctx = loadparm_init_s3(talloc_tos(), loadparm_s3_helpers());
+       if (lp_ctx == NULL) {
+               DBG_ERR("loadparm_init_s3 failed\n");
+               return false;
+       }
+
+       status = smbsock_connect(&domain->dcaddr, lp_ctx, &ts,
                                 domain->dcname, -1, NULL, -1,
                                 fd, NULL, 10);
        if (!NT_STATUS_IS_OK(status)) {