src/java.security.jgss/share/classes/sun/security/jgss/GSSUtil.java

rev 11805 : 8078439: SPNEGO auth fails if client proposes MS krb5 OID

@@ -57,10 +57,12 @@
 
     public static final Oid GSS_KRB5_MECH_OID =
                 GSSUtil.createOid("1.2.840.113554.1.2.2");
     public static final Oid GSS_KRB5_MECH_OID2 =
                 GSSUtil.createOid("1.3.5.1.5.2");
+    public static final Oid GSS_KRB5_MECH_OID_MS =
+                GSSUtil.createOid("1.2.840.48018.1.2.2");
 
     public static final Oid GSS_SPNEGO_MECH_OID =
                 GSSUtil.createOid("1.3.6.1.5.5.2");
 
     public static final Oid NT_GSS_KRB5_PRINCIPAL =

@@ -99,11 +101,12 @@
         return (GSS_SPNEGO_MECH_OID.equals(oid));
     }
 
     public static boolean isKerberosMech(Oid oid) {
         return (GSS_KRB5_MECH_OID.equals(oid) ||
-                GSS_KRB5_MECH_OID2.equals(oid));
+                GSS_KRB5_MECH_OID2.equals(oid) ||
+                GSS_KRB5_MECH_OID_MS.equals(oid));
 
     }
 
     public static String getMechStr(Oid oid) {
         if (isSpNegoMech(oid)) {