X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=mech_eap%2Futil_cred.c;fp=mech_eap%2Futil_cred.c;h=487aa4738e78570d300a95876f86d85ec4d8b394;hb=26311844916784cc0781b1a304b590dff5742fcb;hp=5973ebe9e45dd544d77c28403364ca7a8a889ee1;hpb=0a1171f9f4a213ba20c740c4ba2fac7a8ff423b4;p=mech_eap.git

diff --git a/mech_eap/util_cred.c b/mech_eap/util_cred.c
index 5973ebe..487aa47 100644
--- a/mech_eap/util_cred.c
+++ b/mech_eap/util_cred.c
@@ -243,13 +243,14 @@ cleanup:
 gss_OID
 gssEapPrimaryMechForCred(gss_cred_id_t cred)
 {
-    gss_OID nameMech = GSS_C_NO_OID;
+    gss_OID credMech = GSS_C_NO_OID;
 
-    if (cred->mechanisms != GSS_C_NO_OID_SET &&
+    if (cred != GSS_C_NO_CREDENTIAL &&
+        cred->mechanisms != GSS_C_NO_OID_SET &&
         cred->mechanisms->count == 1)
-        nameMech = &cred->mechanisms->elements[0];
+        credMech = &cred->mechanisms->elements[0];
 
-    return nameMech;
+    return credMech;
 }
 
 OM_uint32
@@ -735,7 +736,8 @@ staticIdentityFileResolveInitiatorCred(OM_uint32 *minor, gss_cred_id_t cred)
             isDefaultIdentity = TRUE;
         } else {
             major = gssEapCompareName(minor, cred->name,
-                                      defaultIdentityName, &isDefaultIdentity);
+                                      defaultIdentityName, 0,
+                                      &isDefaultIdentity);
             if (GSS_ERROR(major))
                 goto cleanup;
         }