s4:libcli: pass struct loadparm_context to smb_connect_nego_send()

It will be passed further down in the next commits.

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

diff --git a/source4/libcli/smb_composite/connect_nego.c b/source4/libcli/smb_composite/connect_nego.c
index f146f37c53478b460eafff9c469074c820c67dc3..9364e2ade09c53cc91162fc559e26f9d5343ded0 100644 (file)
--- a/source4/libcli/smb_composite/connect_nego.c
+++ b/source4/libcli/smb_composite/connect_nego.c
@@ -45,6 +45,7 @@ static void smb_connect_nego_nego_done(struct tevent_req *subreq);
 
 struct tevent_req *smb_connect_nego_send(TALLOC_CTX *mem_ctx,
                                         struct tevent_context *ev,
+                                        struct loadparm_context *lp_ctx,
                                         struct resolve_context *resolve_ctx,
                                         const struct smbcli_options *options,
                                         const char *socket_options,

diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h
index a0a319def681ddde82bc5aecf281578cd7a9acd9..7c1e87aa08f39c5f3ccf8c8f669251ac9bfd2bdd 100644 (file)
--- a/source4/libcli/smb_composite/smb_composite.h
+++ b/source4/libcli/smb_composite/smb_composite.h
@@ -109,6 +109,7 @@ NTSTATUS smb_composite_savefile(struct smbcli_tree *tree,
 */
 struct tevent_req *smb_connect_nego_send(TALLOC_CTX *mem_ctx,
                                         struct tevent_context *ev,
+                                        struct loadparm_context *lp_ctx,
                                         struct resolve_context *resolve_ctx,
                                         const struct smbcli_options *options,
                                         const char *socket_options,

diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index 5d25db77f0bcca47ae1b3d1221765298e7605dd7..fe3bfb41a792353ab7f64498552cf41c1c1bed95 100644 (file)
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -61,6 +61,7 @@ struct dcerpc_pipe_connect {
 struct pipe_np_smb_state {
        struct smb_composite_connect conn;
        struct dcerpc_pipe_connect io;
+       struct loadparm_context *lp_ctx;
 };
 
 
@@ -154,6 +155,7 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb_send(TALLOC_CT
        c->private_data = s;
 
        s->io  = *io;
+       s->lp_ctx = lp_ctx;
        conn   = &s->conn;
 
        if (smbXcli_conn_is_connected(s->io.smb.conn)) {
@@ -234,6 +236,7 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb_send(TALLOC_CT
 
        subreq = smb_connect_nego_send(s,
                                       c->event_ctx,
+                                      s->lp_ctx,
                                       s->io.resolve_ctx,
                                       &conn->in.options,
                                       conn->in.socket_options,