r26337: Move global_loadparm to a higher caller.

(This used to be commit baa5bcd303c72431dfa638edde72cded4265c612)

diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c
index 7cfaf59a650d4c6961799fe4b60c23b10330b129..39bb992d116dab5456aa2800ce3d0fab456b7705 100644 (file)
--- a/source4/libcli/smb2/connect.c
+++ b/source4/libcli/smb2/connect.c
@@ -99,7 +99,7 @@ static void continue_negprot(struct smb2_request *req)
        c->status = smb2_negprot_recv(req, c, &state->negprot);
        if (!composite_is_ok(c)) return;
 
-       state->session = smb2_session_init(transport, state, true);
+       state->session = smb2_session_init(transport, global_loadparm, state, true);
        if (composite_nomem(state->session, c)) return;
 
        creq = smb2_session_setup_spnego_send(state->session, state->credentials);

diff --git a/source4/libcli/smb2/session.c b/source4/libcli/smb2/session.c
index c85dc9157908987c0ad9692edb847397e7ba30a3..a784ea65d8468fa135a8b51dc34eb99f44632bc7 100644 (file)
--- a/source4/libcli/smb2/session.c
+++ b/source4/libcli/smb2/session.c
@@ -31,6 +31,7 @@
   initialise a smb2_session structure
  */
 struct smb2_session *smb2_session_init(struct smb2_transport *transport,
+                                      struct loadparm_context *lp_ctx,
                                       TALLOC_CTX *parent_ctx, bool primary)
 {
        struct smb2_session *session;
@@ -49,7 +50,7 @@ struct smb2_session *smb2_session_init(struct smb2_transport *transport,
        /* prepare a gensec context for later use */
        status = gensec_client_start(session, &session->gensec, 
                                     session->transport->socket->event.ctx, 
-                                    global_loadparm);
+                                    lp_ctx);
        if (!NT_STATUS_IS_OK(status)) {
                talloc_free(session);
                return NULL;