diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-10-20 13:11:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:05 -0500 |
| commit | f203903f1cc00ce443632ac5e9f725276b6c22a2 (patch) | |
| tree | ff7edb93ac992fe6262fbd233e9ba441e47e1d20 | |
| parent | 90550077b9c3eae1a2a15f5fce7ab4b1e05b1f30 (diff) | |
| download | samba-f203903f1cc00ce443632ac5e9f725276b6c22a2.tar.gz samba-f203903f1cc00ce443632ac5e9f725276b6c22a2.tar.bz2 samba-f203903f1cc00ce443632ac5e9f725276b6c22a2.zip | |
r11226: Cope with Samba3's behaviour on LDAP with GSS-SPNEGO.
Andrew Bartlett
(This used to be commit 4d9667f5a037eb15f6f0e4329314a37f148e9db7)
| -rw-r--r-- | source4/auth/gensec/spnego.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/auth/gensec/spnego.c b/source4/auth/gensec/spnego.c index 23be294a17..b7fba789b1 100644 --- a/source4/auth/gensec/spnego.c +++ b/source4/auth/gensec/spnego.c @@ -483,7 +483,6 @@ static NTSTATUS gensec_spnego_create_negTokenInit(struct gensec_security *gensec } /* set next state */ - spnego_state->expected_packet = SPNEGO_NEG_TOKEN_TARG; spnego_state->neg_oid = all_sec[i].oid; if (NT_STATUS_IS_OK(nt_status)) { @@ -611,7 +610,8 @@ static NTSTATUS gensec_spnego_update(struct gensec_security *gensec_security, TA } else { nt_status = gensec_spnego_create_negTokenInit(gensec_security, spnego_state, out_mem_ctx, in, out); - spnego_state->state_position = SPNEGO_SERVER_TARG; + spnego_state->state_position = SPNEGO_SERVER_START; + spnego_state->expected_packet = SPNEGO_NEG_TOKEN_INIT; return nt_status; } } @@ -628,6 +628,7 @@ static NTSTATUS gensec_spnego_update(struct gensec_security *gensec_security, TA nt_status = gensec_spnego_create_negTokenInit(gensec_security, spnego_state, out_mem_ctx, in, out); spnego_state->state_position = SPNEGO_CLIENT_TARG; + spnego_state->expected_packet = SPNEGO_NEG_TOKEN_TARG; return nt_status; } |