[28109] in CVS-changelog-for-Kerberos-V5
krb5 commit: Remove unneeded check in SPNEGO initiator
daemon@ATHENA.MIT.EDU (Greg Hudson)
Mon Dec 16 11:45:30 2013
Date: Mon, 16 Dec 2013 11:45:26 -0500
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201312161645.rBGGjQOQ003409@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/1249c75810e3d5c33ba723c65a904ee914ca8048
commit 1249c75810e3d5c33ba723c65a904ee914ca8048
Author: Greg Hudson <ghudson@mit.edu>
Date: Mon Dec 16 11:35:42 2013 -0500
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.
src/lib/gssapi/spnego/spnego_mech.c | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index d82934b..818a1b4 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);
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
