Merge in workaround for broken Kerberos 10.x gssapi.h

diff --combined mech_eap/util.h
index 2238ac1,588af67..9028257
--- 1/mech_eap/util.h
--- 2/mech_eap/util.h
+++ b/mech_eap/util.h
@@@ -71,6 -71,7 +71,7 @@@
  #include <errno.h>
  
  #include <krb5.h>
+ #include "gssapi_headerfix.h"
  
  #ifdef WIN32
  # ifndef __cplusplus
@@@ -376,8 -377,6 +377,8 @@@ gssEapDeriveRfc3961Key(OM_uint32 *minor
  
  #ifdef HAVE_HEIMDAL_VERSION
  
 +#include <der.h>
 +
  #define KRB_TIME_FOREVER        ((time_t)~0L)
  
  #define KRB_KEY_TYPE(key)       ((key)->keytype)
@@@ -406,11 -405,6 +407,11 @@@
          (cksum)->checksum.data = (d)->value;        \
      } while (0)
  
 +#define KRB_CHECKSUM_FREE(ctx, cksum)          do { \
 +        der_free_octet_string(&(cksum)->checksum);  \
 +        memset((cksum), 0, sizeof(*(cksum)));       \
 +    } while (0)
 +                                    
  #else
  
  #define KRB_TIME_FOREVER        KRB5_INT32_MAX
@@@ -447,8 -441,6 +448,8 @@@
          (cksum)->contents = (d)->value;             \
      } while (0)
  
 +#define KRB_CHECKSUM_FREE(ctx, cksum) krb5_free_checksum_contents((ctx), (cksum))
 +
  #endif /* HAVE_HEIMDAL_VERSION */
  
  #define KRB_KEY_INIT(key)       do {        \