svn rev #25482: trunk/src/lib/gssapi/krb5/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25482
Commit By: ghudson
Log Message:
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 <rhafer at suse.de>.


Changed Files:
U   trunk/src/lib/gssapi/krb5/disp_status.c
Modified: trunk/src/lib/gssapi/krb5/disp_status.c
===================================================================
--- trunk/src/lib/gssapi/krb5/disp_status.c	2011-11-21 17:11:58 UTC (rev 25481)
+++ trunk/src/lib/gssapi/krb5/disp_status.c	2011-11-21 17:30:41 UTC (rev 25482)
@@ -168,7 +168,8 @@
 
     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);
     }