Merge remote-tracking branch 'origin/master'

[mech_eap.orig] / mech_eap / util_reauth.c

diff --git a/mech_eap/util_reauth.c b/mech_eap/util_reauth.c
index a1d7251..50011ca 100644 (file)
--- a/mech_eap/util_reauth.c
+++ b/mech_eap/util_reauth.c
@@ -335,8 +335,13 @@ gssEapMakeReauthCreds(OM_uint32 *minor,
     if (code != 0)
         goto cleanup;
 
+#ifdef HAVE_HEIMDAL_VERSION
+    code = krb5_auth_con_setlocalsubkey(krbContext, authContext,
+                                        &ctx->rfc3961Key);
+#else
     code = krb5_auth_con_setsendsubkey(krbContext, authContext,
                                        &ctx->rfc3961Key);
+#endif
     if (code != 0)
         goto cleanup;
 
@@ -429,8 +434,8 @@ getDefaultReauthCredentials(OM_uint32 *minor,
 
     GSSEAP_KRB_INIT(&krbContext);
 
-    assert(cred != GSS_C_NO_CREDENTIAL);
-    assert(target != GSS_C_NO_NAME);
+    GSSEAP_ASSERT(cred != GSS_C_NO_CREDENTIAL);
+    GSSEAP_ASSERT(target != GSS_C_NO_NAME);
 
     if (cred->name == GSS_C_NO_NAME ||
         !reauthUseCredsCache(krbContext, cred->name->krbPrincipal))
@@ -480,7 +485,8 @@ gssEapCanReauthP(gss_cred_id_t cred,
     time_t now, expiryReq;
     OM_uint32 minor;
 
-    assert(cred != GSS_C_NO_CREDENTIAL);
+    if (cred == GSS_C_NO_CREDENTIAL)
+        return FALSE;
 
     now = time(NULL);
     expiryReq = now;