From 8ecc2964b53ab51b28f331143ed313eba539f8e3 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Mon, 12 Jun 2006 18:35:03 +0000 Subject: [PATCH] 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 --- src/lib/gssapi/krb5/canon_name.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); -- 2.26.2