unbreak Heimdal build

diff --git a/util_cksum.c b/util_cksum.c
index 16e37d1..ba76fd2 100644 (file)
--- a/util_cksum.c
+++ b/util_cksum.c
@@ -79,9 +79,6 @@ gssEapChecksum(krb5_context context,
     size_t kiov_count;
     int i = 0, j;
     size_t k5_checksumlen;
-#ifdef HAVE_HEIMDAL_VERSION
-    krb5_cksumtype cksumtype;
-#endif
 
     if (verify)
         *valid = FALSE;
@@ -139,11 +136,11 @@ gssEapChecksum(krb5_context context,
 #ifdef HAVE_HEIMDAL_VERSION
     if (verify) {
         code = krb5_verify_checksum_iov(context, crypto, sign_usage,
-                                        kiov, kiov_count, &cksumtype);
+                                        kiov, kiov_count, &type);
         *valid = (code == 0);
     } else {
         code = krb5_create_checksum_iov(context, crypto, sign_usage,
-                                        kiov, kiov_count, &cksumtype);
+                                        kiov, kiov_count, &type);
     }
 #else
     if (verify) {

diff --git a/util_name.c b/util_name.c
index 3cade52..3112f88 100644 (file)
--- a/util_name.c
+++ b/util_name.c
@@ -705,7 +705,7 @@ gssEapDisplayName(OM_uint32 *minor,
      */
 #ifdef HAVE_HEIMDAL_VERSION
     if (KRB_PRINC_REALM(name->krbPrincipal) == NULL ||
-        KRB_PRINC_REALM(name->krBPrincipal)[0] == '\0')
+        KRB_PRINC_REALM(name->krbPrincipal)[0] == '\0')
 #else
     if (KRB_PRINC_REALM(name->krbPrincipal)->length == 0)
 #endif

diff --git a/util_reauth.c b/util_reauth.c
index 72c789f..465bb16 100644 (file)
--- a/util_reauth.c
+++ b/util_reauth.c
@@ -654,9 +654,8 @@ defrostAttrContext(OM_uint32 *minor,
 #ifdef HAVE_HEIMDAL_VERSION
                    gss_ctx_id_t glueContext,
 #else
-                   gss_ctx_id_t glueContext GSSEAP_UNUSED,
-#endif
                    gss_name_t glueName,
+#endif
                    gss_name_t mechName)
 {
     OM_uint32 major, tmpMinor;
@@ -738,7 +737,13 @@ gssEapGlueToMechName(OM_uint32 *minor,
     if (GSS_ERROR(major))
         goto cleanup;
 
-    major = defrostAttrContext(minor, ctx->kerberosCtx, glueName, *pMechName);
+    major = defrostAttrContext(minor,
+#ifdef HAVE_HEIMDAL_VERSION
+                               ctx->kerberosCtx,
+#else
+                               glueName,
+#endif
+                               *pMechName);
     if (GSS_ERROR(major))
         goto cleanup;