Change patch so that either mechanism is accepted

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10434 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 721ab713177d5b0fc8b5c01e01163c0255dfa19a..05b5afcb88284915b6fc8c2418ba86cb4b6391d2 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,7 +1,8 @@
 Fri Feb 13 13:23:18 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
-       * accept_sec_context.c (krb5_gss_accept_sec_context): Always allow
-               use of the pre RFC mechanism when accepting contexts.
+       * accept_sec_context.c (krb5_gss_accept_sec_context): Don't
+               restrict mechanisms when accepting contexts.  (Allow
+               either pre-RFC or RFC-based mechanisms)
 
 Thu Feb 12 16:38:14 1998  Tom Yu  <tlyu@mit.edu>
 

diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index 06dfe9dae3ab5923cb9b30bf1b270d3d26232eae..181e67565e7d218d71c1c33b9d7471432874e525 100644 (file)
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -264,23 +264,23 @@ krb5_gss_accept_sec_context(minor_status, context_handle,
                major_status = GSS_S_DEFECTIVE_TOKEN;
                goto fail;
        } else {
-#if 0        /* Always allow use of the pre-RFC mechanism */
+#if 0       /* Don't restrict mechanisms when accepting contexts */
             if (! cred->prerfc_mech) {
                     code = G_WRONG_MECH;
                     major_status = GSS_S_DEFECTIVE_TOKEN;
                     goto fail;
             }
 #endif
-
             mech_used = gss_mech_krb5_old;
        }
    } else {
+#if 0  /* Don't restrict mechanisms when accepting contexts */
        if (! cred->rfc_mech) {
                code = G_WRONG_MECH;
                major_status = GSS_S_DEFECTIVE_TOKEN;
                goto fail;
        }
-
+#endif
        mech_used = gss_mech_krb5;
    }