summaryrefslogtreecommitdiff
path: root/source4/utils/ntlm_auth.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-22 10:21:22 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-22 10:21:22 +0200
commit38a4f9df170fba0a05755e06dd4362d471b3db80 (patch)
treea1f3623e06ce4fd1e010afd5e72062dbee0d9b83 /source4/utils/ntlm_auth.c
parent54efc107e58ed1eed7109ea08fdf808e3a15327b (diff)
parent7dddab3f6cdb36a537ca3ed9c9f3461993d1c11c (diff)
downloadsamba-38a4f9df170fba0a05755e06dd4362d471b3db80.tar.gz
samba-38a4f9df170fba0a05755e06dd4362d471b3db80.tar.bz2
samba-38a4f9df170fba0a05755e06dd4362d471b3db80.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 1e38de45640430be002053b8bd52b615184134ba)
Diffstat (limited to 'source4/utils/ntlm_auth.c')
-rw-r--r--source4/utils/ntlm_auth.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c
index 0c9a41fd70..07c0e4f31e 100644
--- a/source4/utils/ntlm_auth.c
+++ b/source4/utils/ntlm_auth.c
@@ -461,6 +461,10 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
return;
}
+ ev = event_context_init(state);
+ if (!ev) {
+ exit(1);
+ }
/* setup gensec */
if (!(state->gensec_state)) {
switch (stdio_helper_mode) {
@@ -468,7 +472,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, NULL, lp_ctx);
+ nt_status = gensec_client_start(NULL, &state->gensec_state, ev, lp_ctx);
if (!NT_STATUS_IS_OK(nt_status)) {
exit(1);
}
@@ -476,10 +480,6 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
break;
case GSS_SPNEGO_SERVER:
case SQUID_2_5_NTLMSSP:
- ev = event_context_init(state);
- if (!ev) {
- exit(1);
- }
msg = messaging_client_init(state, lp_messaging_path(state, lp_ctx),
lp_iconv_convenience(lp_ctx), ev);
if (!msg) {