summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-08-20 07:31:29 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:33:37 -0500
commit6baa6e0aa8dfd539a4fa3185a055eb8b1f4896c0 (patch)
tree62b55ec76338969575f06458375c23d9784d0457
parent1ba76ee8baa740213e1cce9a77866457d794fbce (diff)
downloadsamba-6baa6e0aa8dfd539a4fa3185a055eb8b1f4896c0.tar.gz
samba-6baa6e0aa8dfd539a4fa3185a055eb8b1f4896c0.tar.xz
samba-6baa6e0aa8dfd539a4fa3185a055eb8b1f4896c0.zip
r9420: Fix the SPNEGO system again: Update the state position after
processing the state. Andrew Bartlett (This used to be commit c3a8080a189e084c5774bdd1a9f3ea62daed715e)
-rw-r--r--source4/auth/gensec/spnego.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/auth/gensec/spnego.c b/source4/auth/gensec/spnego.c
index f5363467e87..ab18cbc1b45 100644
--- a/source4/auth/gensec/spnego.c
+++ b/source4/auth/gensec/spnego.c
@@ -596,9 +596,10 @@ static NTSTATUS gensec_spnego_update(struct gensec_security *gensec_security, TA
return nt_status;
} else {
- spnego_state->state_position = SPNEGO_SERVER_TARG;
- return gensec_spnego_create_negTokenInit(gensec_security, spnego_state,
+ nt_status = gensec_spnego_create_negTokenInit(gensec_security, spnego_state,
out_mem_ctx, in, out);
+ spnego_state->state_position = SPNEGO_SERVER_TARG;
+ return nt_status;
}
}
@@ -611,9 +612,10 @@ static NTSTATUS gensec_spnego_update(struct gensec_security *gensec_security, TA
if (!in.length) {
/* client to produce negTokenInit */
- spnego_state->state_position = SPNEGO_CLIENT_TARG;
- return gensec_spnego_create_negTokenInit(gensec_security, spnego_state,
+ nt_status = gensec_spnego_create_negTokenInit(gensec_security, spnego_state,
out_mem_ctx, in, out);
+ spnego_state->state_position = SPNEGO_CLIENT_TARG;
+ return nt_status;
}
len = spnego_read_data(in, &spnego);