svn rev #23860: branches/iakerb/src/lib/gssapi/spnego/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23860
Commit By: ghudson
Log Message:
In spnego_mech.c, revert r23225 from Luke's branch.  The logic errors
were fixed independently on the trunk in r23742 (#6603) and the first
hunk would cause spnego_gss_init_sec_context to seg fault when passed
GSS_C_NO_BUFFER as input_token.



Changed Files:
U   branches/iakerb/src/lib/gssapi/spnego/spnego_mech.c
Modified: branches/iakerb/src/lib/gssapi/spnego/spnego_mech.c
===================================================================
--- branches/iakerb/src/lib/gssapi/spnego/spnego_mech.c	2010-04-04 20:54:42 UTC (rev 23859)
+++ branches/iakerb/src/lib/gssapi/spnego/spnego_mech.c	2010-04-04 23:47:46 UTC (rev 23860)
@@ -858,7 +858,7 @@
 		 * token back if this is the first token or if a MIC exchange
 		 * is required.
 		 */
-		if (mechtok_in->length != 0 &&
+		if (*send_token == CONT_TOKEN_SEND &&
 		    mechtok_out->length == 0 &&
 		    (!sc->mic_reqd ||
 		     !(sc->ctx_flags & GSS_C_INTEG_FLAG))) {
@@ -879,8 +879,7 @@
 			*send_token = ERROR_TOKEN_SEND;
 		}
 		*negState = REJECT;
-	} else if (*send_token == NO_TOKEN_SEND)
-		*send_token = CONT_TOKEN_SEND;
+	}
 	return ret;
 }