From: Greg Hudson <ghudson@mit.edu>
Date: Mon, 16 Dec 2013 16:35:42 +0000 (-0500)
Subject: Remove unneeded check in SPNEGO initiator
X-Git-Tag: krb5-1.13-alpha1~291
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1249c75810e3d5c33ba723c65a904ee914ca8048;p=thirdparty%2Fkrb5.git

Remove unneeded check in SPNEGO initiator

In init_ctx_cont, if the response token contains no fields, we set a
return value but don't actually quit out of the function.  We do not
need this check (we will fail later on if a piece of required
information isn't present), so just remove it.  Reported by
simo@redhat.com.
---

diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index d82934b6cd..818a1b4439 100644
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -648,13 +648,6 @@ init_ctx_cont(OM_uint32 *minor_status, gss_ctx_id_t *ctx, gss_buffer_t buf,
 			       responseToken, mechListMIC);
 	if (ret != GSS_S_COMPLETE)
 		goto cleanup;
-	if (acc_negState == ACCEPT_DEFECTIVE_TOKEN &&
-	    supportedMech == GSS_C_NO_OID &&
-	    *responseToken == GSS_C_NO_BUFFER &&
-	    *mechListMIC == GSS_C_NO_BUFFER) {
-		/* Reject "empty" token. */
-		ret = GSS_S_DEFECTIVE_TOKEN;
-	}
 	if (acc_negState == REJECT) {
 		*minor_status = ERR_SPNEGO_NEGOTIATION_FAILED;
 		map_errcode(minor_status);