r3538: Fix the build with the latest Heimdal code.

Jeremy.

diff --git a/source/configure.in b/source/configure.in
index d32d68435863ad9151d2664f786483ae28168ef9..170b3c0d1c3b812954c0fd284cf58755a6d858a1 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -2795,6 +2795,18 @@ if test x"$with_ads_support" != x"no"; then
 
   LIBS="$KRB5_LIBS $LIBS"
   
+  AC_CACHE_CHECK([for krb5_encrypt_block type],
+                samba_cv_HAVE_KRB5_ENCRYPT_BLOCK,[
+    AC_TRY_COMPILE([#include <krb5.h>],
+      [krb5_encrypt_block block;],
+      samba_cv_HAVE_KRB5_ENCRYPT_BLOCK=yes,
+      samba_cv_HAVE_KRB5_ENCRYPT_BLOCK=no)])
+
+  if test x"$samba_cv_HAVE_KRB5_ENCRYPT_BLOCK" = x"yes"; then
+    AC_DEFINE(HAVE_KRB5_ENCRYPT_BLOCK,1,
+               [Whether the type krb5_encrypt_block exists])
+  fi
+
   AC_CACHE_CHECK([for addrtype in krb5_address],
                 samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS,[
     AC_TRY_COMPILE([#include <krb5.h>],

diff --git a/source/include/includes.h b/source/include/includes.h
index 3999ef48bd73683b38b3db367d3f20236f060b94..6a1681fe1f17ee03aada9857d7407141e029ff6e 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -455,13 +455,9 @@
 
 #if HAVE_GSSAPI_H
 #include <gssapi.h>
-#endif
-
-#if HAVE_GSSAPI_GSSAPI_H
+#elif HAVE_GSSAPI_GSSAPI_H
 #include <gssapi/gssapi.h>
-#endif
-
-#if HAVE_GSSAPI_GSSAPI_GENERIC_H
+#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
 #include <gssapi/gssapi_generic.h>
 #endif
 

diff --git a/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c
index bc52805dfff6f2ef4840059fdf43699ef1d742e4..068e78220723067f8fc233bc1ea43795fe15b563 100644 (file)
--- a/source/libsmb/clikrb5.c
+++ b/source/libsmb/clikrb5.c
@@ -80,7 +80,7 @@
 #error UNKNOWN_ADDRTYPE
 #endif
 
-#if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_STRING_TO_KEY)
+#if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_STRING_TO_KEY) && defined(HAVE_KRB5_ENCRYPT_BLOCK)
  int create_kerberos_key_from_string_direct(krb5_context context,
                                        krb5_principal host_princ,
                                        krb5_data *password,