diff options
| author | Russ Allbery <rra@stanford.edu> | 2006-06-12 18:35:03 +0000 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2006-06-12 18:35:03 +0000 |
| commit | 8ecc2964b53ab51b28f331143ed313eba539f8e3 (patch) | |
| tree | 2bc7bfb7696d493bb88fb916dbf9b3d890310d96 /src/lib/gssapi | |
| parent | e52cd0c4da8586bed7325b56d50a1f0adf0130d9 (diff) | |
| download | krb5-8ecc2964b53ab51b28f331143ed313eba539f8e3.tar.gz krb5-8ecc2964b53ab51b28f331143ed313eba539f8e3.tar.xz krb5-8ecc2964b53ab51b28f331143ed313eba539f8e3.zip | |
If krb5_gss_canonicalize_name is given GSS_C_NULL_OID as the mechanism,
assume krb5 using similar logic as other library functions rather than
failing. Patch provided by Daniel Kahn Gillmor.
Ticket: 3467
Version_Reported: 1.4.3
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18113 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi')
| -rw-r--r-- | src/lib/gssapi/krb5/canon_name.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/gssapi/krb5/canon_name.c b/src/lib/gssapi/krb5/canon_name.c index aed67c352..0f7c9cd9c 100644 --- a/src/lib/gssapi/krb5/canon_name.c +++ b/src/lib/gssapi/krb5/canon_name.c @@ -34,7 +34,8 @@ OM_uint32 krb5_gss_canonicalize_name(OM_uint32 *minor_status, const gss_OID mech_type, gss_name_t *output_name) { - if (!g_OID_equal(gss_mech_krb5, mech_type) && + if ((mech_type != GSS_C_NULL_OID) && + !g_OID_equal(gss_mech_krb5, mech_type) && !g_OID_equal(gss_mech_krb5_old, mech_type)) { *minor_status = 0; return(GSS_S_BAD_MECH); |