Author: jelmer Date: 2007-12-07 16:04:25 +0000 (Fri, 07 Dec 2007) New Revision: 26337
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26337 Log: Move global_loadparm to a higher caller. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/libcli/smb2/connect.c branches/SAMBA_4_0/source/libcli/smb2/session.c Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/libcli/smb2/connect.c =================================================================== --- branches/SAMBA_4_0/source/libcli/smb2/connect.c 2007-12-07 16:04:22 UTC (rev 26336) +++ branches/SAMBA_4_0/source/libcli/smb2/connect.c 2007-12-07 16:04:25 UTC (rev 26337) @@ -99,7 +99,7 @@ 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); Modified: branches/SAMBA_4_0/source/libcli/smb2/session.c =================================================================== --- branches/SAMBA_4_0/source/libcli/smb2/session.c 2007-12-07 16:04:22 UTC (rev 26336) +++ branches/SAMBA_4_0/source/libcli/smb2/session.c 2007-12-07 16:04:25 UTC (rev 26337) @@ -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 @@ /* 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;
