summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-07 16:04:25 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:48:47 +0100
commitda2ae4995370affe57cfecfe371a4edf553065d0 (patch)
tree447067831eef513e769d13163785cabc4284d7f6
parent6dc73da601b23d64bb4f78358b1924210cbc8ec6 (diff)
downloadsamba-da2ae4995370affe57cfecfe371a4edf553065d0.tar.gz
samba-da2ae4995370affe57cfecfe371a4edf553065d0.tar.bz2
samba-da2ae4995370affe57cfecfe371a4edf553065d0.zip
r26337: Move global_loadparm to a higher caller.
(This used to be commit baa5bcd303c72431dfa638edde72cded4265c612)
-rw-r--r--source4/libcli/smb2/connect.c2
-rw-r--r--source4/libcli/smb2/session.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c
index 7cfaf59a65..39bb992d11 100644
--- 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 c85dc91579..a784ea65d8 100644
--- 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;