diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-10-17 09:22:33 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-18 13:13:33 +1100 |
| commit | e7d5f0a357c42593a015b80390dedf920117a7e2 (patch) | |
| tree | a4fa1a53f0294607b4abeb6f389ce719502fe849 /source4/utils | |
| parent | 0f2b27e7d428e75b8e6079ee5f36a0cccd4d1785 (diff) | |
| download | samba-e7d5f0a357c42593a015b80390dedf920117a7e2.tar.gz samba-e7d5f0a357c42593a015b80390dedf920117a7e2.tar.bz2 samba-e7d5f0a357c42593a015b80390dedf920117a7e2.zip | |
gensec: move event context from gensec_*_init() to gensec_update()
This avoids keeping the event context around on a the gensec_security
context structure long term.
In the Samba3 server, the event context we either supply is a NULL
pointer as no server-side modules currently use the event context.
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4/utils')
| -rw-r--r-- | source4/utils/ntlm_auth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c index c0a06bd336..cc92c170b6 100644 --- a/source4/utils/ntlm_auth.c +++ b/source4/utils/ntlm_auth.c @@ -449,7 +449,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode, case NTLMSSP_CLIENT_1: /* setup the client side */ - nt_status = gensec_client_start(NULL, &state->gensec_state, ev, + nt_status = gensec_client_start(NULL, &state->gensec_state, lpcfg_gensec_settings(NULL, lp_ctx)); if (!NT_STATUS_IS_OK(nt_status)) { talloc_free(mem_ctx); @@ -481,7 +481,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode, exit(1); } - if (!NT_STATUS_IS_OK(gensec_server_start(state, ev, + if (!NT_STATUS_IS_OK(gensec_server_start(state, lpcfg_gensec_settings(state, lp_ctx), auth_context, &state->gensec_state))) { talloc_free(mem_ctx); @@ -632,7 +632,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode, return; } - nt_status = gensec_update(state->gensec_state, mem_ctx, in, &out); + nt_status = gensec_update(state->gensec_state, mem_ctx, ev, in, &out); /* don't leak 'bad password'/'no such user' info to the network client */ nt_status = nt_status_squash(nt_status); |