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

abartlet at samba.org abartlet at samba.org
Sat Aug 20 07:31:30 GMT 2005


Author: abartlet
Date: 2005-08-20 07:31:29 +0000 (Sat, 20 Aug 2005)
New Revision: 9420

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

Log:
Fix the SPNEGO system again: Update the state position after
processing the state.

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-08-20 07:04:13 UTC (rev 9419)
+++ branches/SAMBA_4_0/source/auth/gensec/spnego.c	2005-08-20 07:31:29 UTC (rev 9420)
@@ -596,9 +596,10 @@
 			
 			return nt_status;
 		} else {
+			nt_status = gensec_spnego_create_negTokenInit(gensec_security, spnego_state, 
+								 out_mem_ctx, in, out);
 			spnego_state->state_position = SPNEGO_SERVER_TARG;
-			return gensec_spnego_create_negTokenInit(gensec_security, spnego_state, 
-								 out_mem_ctx, in, out);
+			return nt_status;
 		}
 	}
 	
@@ -611,9 +612,10 @@
 
 		if (!in.length) {
 			/* client to produce negTokenInit */
+			nt_status = gensec_spnego_create_negTokenInit(gensec_security, spnego_state, 
+								 out_mem_ctx, in, out);
 			spnego_state->state_position = SPNEGO_CLIENT_TARG;
-			return gensec_spnego_create_negTokenInit(gensec_security, spnego_state, 
-								 out_mem_ctx, in, out);
+			return nt_status;
 		}
 		
 		len = spnego_read_data(in, &spnego);



More information about the samba-cvs mailing list