diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 02:05:48 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-02 02:05:48 +0100 |
| commit | b034c519f53cffbac21c3db79ee24cdd8f1ce4a2 (patch) | |
| tree | d27a5e0010bdaf1f9f47174cb244b90f3feb96a6 /source4/libcli/smb2 | |
| parent | 9265cb02d00843f43ba07d28093f959adf0738fe (diff) | |
| download | samba-b034c519f53cffbac21c3db79ee24cdd8f1ce4a2.tar.gz samba-b034c519f53cffbac21c3db79ee24cdd8f1ce4a2.tar.bz2 samba-b034c519f53cffbac21c3db79ee24cdd8f1ce4a2.zip | |
Add gensec_settings structure. This wraps loadparm_context for now, but
should in the future only contain some settings required for gensec.
Diffstat (limited to 'source4/libcli/smb2')
| -rw-r--r-- | source4/libcli/smb2/connect.c | 3 | ||||
| -rw-r--r-- | source4/libcli/smb2/session.c | 5 | ||||
| -rw-r--r-- | source4/libcli/smb2/smb2_calls.h | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c index 61ee994484..27c78fbce0 100644 --- a/source4/libcli/smb2/connect.c +++ b/source4/libcli/smb2/connect.c @@ -140,7 +140,7 @@ static void continue_negprot(struct smb2_request *req) break; } - state->session = smb2_session_init(transport, global_loadparm, state, true); + state->session = smb2_session_init(transport, lp_gensec_settings(transport, global_loadparm), state, true); if (composite_nomem(state->session, c)) return; creq = smb2_session_setup_spnego_send(state->session, state->credentials); @@ -239,6 +239,7 @@ struct composite_context *smb2_connect_send(TALLOC_CTX *mem_ctx, const char *socket_options) { struct composite_context *c; + const char *default_ports[] = { "445", NULL }; struct smb2_connect_state *state; struct nbt_name name; struct composite_context *creq; diff --git a/source4/libcli/smb2/session.c b/source4/libcli/smb2/session.c index 31b3e942e9..127bb9bcae 100644 --- a/source4/libcli/smb2/session.c +++ b/source4/libcli/smb2/session.c @@ -25,13 +25,12 @@ #include "libcli/smb2/smb2_calls.h" #include "libcli/composite/composite.h" #include "auth/gensec/gensec.h" -#include "param/param.h" /** initialise a smb2_session structure */ struct smb2_session *smb2_session_init(struct smb2_transport *transport, - struct loadparm_context *lp_ctx, + struct gensec_settings *settings, TALLOC_CTX *parent_ctx, bool primary) { struct smb2_session *session; @@ -50,7 +49,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, - lp_ctx); + settings); if (!NT_STATUS_IS_OK(status)) { talloc_free(session); return NULL; diff --git a/source4/libcli/smb2/smb2_calls.h b/source4/libcli/smb2/smb2_calls.h index f66236af30..ec246b209d 100644 --- a/source4/libcli/smb2/smb2_calls.h +++ b/source4/libcli/smb2/smb2_calls.h @@ -107,4 +107,5 @@ struct smb2_setinfo { struct cli_credentials; struct event_context; struct resolve_context; +struct gensec_settings; #include "libcli/smb2/smb2_proto.h" |