From: Tom Yu Date: Mon, 5 Dec 2011 20:32:57 +0000 (+0000) Subject: pull up r25482 from trunk X-Git-Tag: krb5-1.10-alpha2~17 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a5a639c71ea1eba400d2e07796357e7f4147942c;p=krb5.git pull up r25482 from trunk ------------------------------------------------------------------------ r25482 | ghudson | 2011-11-21 12:30:41 -0500 (Mon, 21 Nov 2011) | 10 lines ticket: 7020 target_version: 1.10 tags: pullup Recognize IAKERB mech in krb5_gss_display_status Minor status codes were not displaying properly when originated from the IAKERB mech, because of a safety check on mech_type. From Ralf Haferkamp . ticket: 7020 version_fixed: 1.10 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-10@25511 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/gssapi/krb5/disp_status.c b/src/lib/gssapi/krb5/disp_status.c index cb440b439..d33ad7f2c 100644 --- a/src/lib/gssapi/krb5/disp_status.c +++ b/src/lib/gssapi/krb5/disp_status.c @@ -168,7 +168,8 @@ krb5_gss_display_status(minor_status, status_value, status_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)) { + !g_OID_equal(gss_mech_krb5_old, mech_type) && + !g_OID_equal(gss_mech_iakerb, mech_type)) { *minor_status = 0; return(GSS_S_BAD_MECH); }