From: Mark Donnelly <mark@painless-security.com>
Date: Wed, 30 Aug 2017 13:44:50 +0000 (-0400)
Subject: Fixes for Heimdal (macOS) builds from Stefan.
X-Git-Tag: debian/1.0.1-1~4^2^2
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=commitdiff_plain;h=HEAD

Fixes for Heimdal (macOS) builds from Stefan.
---

diff --git a/acinclude.m4 b/acinclude.m4
index 011eab2..aaf604a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -56,9 +56,9 @@ else
 	AC_CHECK_LIB(krb5, GSS_C_NT_COMPOSITE_EXPORT, [AC_DEFINE_UNQUOTED([HAVE_GSS_C_NT_COMPOSITE_EXPORT], 1, [Define if GSS-API library supports recent naming extensions draft])], [], "$KRB5_LIBS")
 	AC_CHECK_LIB(krb5, gss_inquire_attrs_for_mech, [AC_DEFINE_UNQUOTED([HAVE_GSS_INQUIRE_ATTRS_FOR_MECH], 1, [Define if GSS-API library supports RFC 5587])], [], "$KRB5_LIBS")
 	AC_CHECK_LIB(krb5, gss_krb5_import_cred, [AC_DEFINE_UNQUOTED([HAVE_GSS_KRB5_IMPORT_CRED], 1, [Define if GSS-API library supports gss_krb5_import_cred])], [], "$KRB5_LIBS")
-        AC_CHECK_LIB(krb5, heimdal_version, [AC_DEFINE_UNQUOTED([HAVE_HEIMDAL_VERSION], 1, [Define if building against Heimdal Kerberos implementation]), heimdal=yes], [heimdal=no], "$KRB5_LIBS")
-        AM_CONDITIONAL(HEIMDAL, test "x$heimdal" != "xno")
-        AC_CHECK_TYPE(gss_const_name_t, [AC_DEFINE([MECHEAP_GSS_CONST_NAME_T_IS_POINTER], 1, [Define if gss_const_name_t is a pointer. Broken krb5 10.x headers define it as a struct.])], [], [[#include <gssapi/gssapi.h>"]])
+  AC_CHECK_LIB(krb5, heimdal_version, [AC_DEFINE_UNQUOTED([HAVE_HEIMDAL_VERSION], 1, [Define if building against Heimdal Kerberos implementation])  heimdal=yes], [heimdal=no], "$KRB5_LIBS")
+  AM_CONDITIONAL(HEIMDAL, test "x$heimdal" != "xno")
+  AC_CHECK_TYPE(gss_const_name_t, [AC_DEFINE([MECHEAP_GSS_CONST_NAME_T_IS_POINTER], 1, [Define if gss_const_name_t is a pointer. Broken krb5 10.x headers define it as a struct.])], [], [[#include <gssapi/gssapi.h>"]])
 fi
 ])dnl
 
diff --git a/mech_eap/gssapiP_eap.h b/mech_eap/gssapiP_eap.h
index 899337b..aae76be 100644
--- a/mech_eap/gssapiP_eap.h
+++ b/mech_eap/gssapiP_eap.h
@@ -83,7 +83,11 @@ typedef const gss_OID_desc *gss_const_OID;
 
 /* Kerberos headers */
 #include <krb5.h>
+#ifdef HAVE_HEIMDAL_VERSION
+#include <com_err.h>
+#else
 #include <et/com_err.h>
+#endif
 
 /* EAP headers */
 #include <includes.h>
@@ -101,7 +105,9 @@ typedef const gss_OID_desc *gss_const_OID;
 #include <radsec/radius.h>
 #endif
 
+#ifndef HAVE_HEIMDAL_VERSION
 #include "gssapi_headerfix.h"
+#endif
 #include "gsseap_err.h"
 #include "radsec_err.h"
 #include "util.h"
diff --git a/mech_eap/util.h b/mech_eap/util.h
index 9028257..bf3a25a 100644
--- a/mech_eap/util.h
+++ b/mech_eap/util.h
@@ -71,7 +71,9 @@
 #include <errno.h>
 
 #include <krb5.h>
+#ifndef HAVE_HEIMDAL_VERSION
 #include "gssapi_headerfix.h"
+#endif
 
 #ifdef WIN32
 # ifndef __cplusplus
diff --git a/mech_eap/util_attr.h b/mech_eap/util_attr.h
index 6a6dfe1..32a3f78 100644
--- a/mech_eap/util_attr.h
+++ b/mech_eap/util_attr.h
@@ -41,7 +41,9 @@
 #include <string>
 #include <new>
 
+#ifndef HAVE_HEIMDAL_VERSION
 #include "gssapi_headerfix.h"
+#endif
 
 using namespace gss_eap_util;