]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Remove special case for multi-hop SAM-2
authorGreg Hudson <ghudson@mit.edu>
Tue, 27 Jan 2015 03:34:49 +0000 (22:34 -0500)
committerGreg Hudson <ghudson@mit.edu>
Wed, 28 Jan 2015 22:35:30 +0000 (17:35 -0500)
Revert f20a77e879d203cdcb1bdbf9dc8e604a5187c88f (issue #7571).  The
special case is no longer needed, as we are now resetting the tried
list for each KDC_ERR_PREAUTH_REQUIRED message.

src/lib/krb5/krb/preauth2.c

index 8745cb11a31c9a6efdb1f3b777465593f17219c1..783bb3154ddbb145744ab5034a47a8942e6304b0 100644 (file)
@@ -560,11 +560,6 @@ already_tried(krb5_context context, krb5_preauthtype pa_type)
     size_t count;
     krb5_preauthtype *newptr;
 
-    /* Allow multi-hop SAM-2 exchanges using repeated preauth-required errors
-     * for historical compatibility. */
-    if (pa_type == KRB5_PADATA_SAM_CHALLENGE_2)
-        return FALSE;
-
     for (count = 0; pctx->tried != NULL && pctx->tried[count] != 0; count++) {
         if (pctx->tried[count] == pa_type)
             return TRUE;