diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 17:41:50 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:34 +0100 |
| commit | ecea5ce24553989103d4a06296b24f4d29f30a36 (patch) | |
| tree | 806e6d582a799f24061dc5ca9df2ac36c26ad4f6 /source4/libcli | |
| parent | ab5bbd26029e8ae62256c454daee14852b940a6a (diff) | |
| download | samba-ecea5ce24553989103d4a06296b24f4d29f30a36.tar.gz samba-ecea5ce24553989103d4a06296b24f4d29f30a36.tar.bz2 samba-ecea5ce24553989103d4a06296b24f4d29f30a36.zip | |
r26260: Store loadparm context in gensec context.
(This used to be commit b9e3a4862e267be39d603fed8207a237c3d72081)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/ldap/ldap_bind.c | 3 | ||||
| -rw-r--r-- | source4/libcli/smb2/session.c | 10 | ||||
| -rw-r--r-- | source4/libcli/smb_composite/sesssetup.c | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/source4/libcli/ldap/ldap_bind.c b/source4/libcli/ldap/ldap_bind.c index d285735d4e..60bfb52e2d 100644 --- a/source4/libcli/ldap/ldap_bind.c +++ b/source4/libcli/ldap/ldap_bind.c @@ -29,6 +29,7 @@ #include "auth/gensec/socket.h" #include "auth/credentials/credentials.h" #include "lib/stream/packet.h" +#include "param/param.h" struct ldap_simple_creds { const char *dn; @@ -217,7 +218,7 @@ NTSTATUS ldap_bind_sasl(struct ldap_connection *conn, struct cli_credentials *cr NULL }; - status = gensec_client_start(conn, &conn->gensec, NULL); + status = gensec_client_start(conn, &conn->gensec, NULL, global_loadparm); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("Failed to start GENSEC engine (%s)\n", nt_errstr(status))); goto failed; diff --git a/source4/libcli/smb2/session.c b/source4/libcli/smb2/session.c index 462f60d2c2..c85dc91579 100644 --- a/source4/libcli/smb2/session.c +++ b/source4/libcli/smb2/session.c @@ -25,8 +25,9 @@ #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, @@ -47,7 +48,8 @@ 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); + session->transport->socket->event.ctx, + global_loadparm); if (!NT_STATUS_IS_OK(status)) { talloc_free(session); return NULL; @@ -58,7 +60,7 @@ struct smb2_session *smb2_session_init(struct smb2_transport *transport, return session; } -/* +/** send a session setup request */ struct smb2_request *smb2_session_setup_send(struct smb2_session *session, @@ -91,7 +93,7 @@ struct smb2_request *smb2_session_setup_send(struct smb2_session *session, } -/* +/** recv a session setup reply */ NTSTATUS smb2_session_setup_recv(struct smb2_request *req, TALLOC_CTX *mem_ctx, diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c index a726860647..3ed0bb2473 100644 --- a/source4/libcli/smb_composite/sesssetup.c +++ b/source4/libcli/smb_composite/sesssetup.c @@ -365,7 +365,8 @@ static NTSTATUS session_setup_spnego(struct composite_context *c, smbcli_temp_set_signing(session->transport); - status = gensec_client_start(session, &session->gensec, c->event_ctx); + status = gensec_client_start(session, &session->gensec, c->event_ctx, + global_loadparm); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("Failed to start GENSEC client mode: %s\n", nt_errstr(status))); return status; |