From: Greg Hudson <ghudson@mit.edu>
Date: Mon, 21 Nov 2011 17:30:41 +0000 (+0000)
Subject: Recognize IAKERB mech in krb5_gss_display_status
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7805327f31940d27e78aecc339108c138f0bec4;p=krb5.git

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 <rhafer@suse.de>.

ticket: 7020
target_version: 1.10
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25482 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);
     }