diff options
| author | Theodore Tso <tytso@mit.edu> | 1998-02-13 20:16:40 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1998-02-13 20:16:40 +0000 |
| commit | b3c3810a8ac49d4c1776776b9cbb3cceecb19bfd (patch) | |
| tree | d71b37bc5a7a96e0907fc2141d40c30705be36fa | |
| parent | 0ee77c7db6e8ad3a81d2be27f6a41993c4f4d673 (diff) | |
| download | krb5-b3c3810a8ac49d4c1776776b9cbb3cceecb19bfd.tar.gz krb5-b3c3810a8ac49d4c1776776b9cbb3cceecb19bfd.tar.xz krb5-b3c3810a8ac49d4c1776776b9cbb3cceecb19bfd.zip | |
Change patch so that either mechanism is accepted
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10434 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/gssapi/krb5/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/accept_sec_context.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 721ab71317..05b5afcb88 100644 --- 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 06dfe9dae3..181e67565e 100644 --- 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; } |