svn commit: samba r11226 - in branches/SAMBA_4_0/source/auth/gensec: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-10-20 13:11:06 +0000 (Thu, 20 Oct 2005)
New Revision: 11226

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11226

Log:
Cope with Samba3's behaviour on LDAP with GSS-SPNEGO.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/gensec/spnego.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/gensec/spnego.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/spnego.c	2005-10-20 13:10:20 UTC (rev 11225)
+++ branches/SAMBA_4_0/source/auth/gensec/spnego.c	2005-10-20 13:11:06 UTC (rev 11226)
@@ -483,7 +483,6 @@
 		}
 		
 		/* 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 @@
 		} 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 @@
 			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;
 		}