svn rev #25511: branches/krb5-1-10/src/lib/gssapi/krb5/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25511
Commit By: tlyu
Log Message:
ticket: 7020
version_fixed: 1.10
status: resolved

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


Changed Files:
U   branches/krb5-1-10/src/lib/gssapi/krb5/disp_status.c
Modified: branches/krb5-1-10/src/lib/gssapi/krb5/disp_status.c
===================================================================
--- branches/krb5-1-10/src/lib/gssapi/krb5/disp_status.c	2011-12-05 20:16:05 UTC (rev 25510)
+++ branches/krb5-1-10/src/lib/gssapi/krb5/disp_status.c	2011-12-05 20:32:57 UTC (rev 25511)
@@ -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);
     }