s3-kerberos: next step to resolve Bug #6929: build with recent heimdal.

Based on patch from Allan <allan@archlinux.org>.

Also should fix the FreeBSD build on the buildfarm.

Guenther
(cherry picked from commit 5b3a32be97a37c119e837bdee8f049684565458c)
(cherry picked from commit d89231e76c618c5d10244ed4bec68dac8fa9cb3c)

diff --git a/source/configure.in b/source/configure.in
index ead0e29fa0d25d5e2195220edefa9909b4b9ef7d..1092d00b17d1aebdb3e0f928e9762823e8746c51 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -3519,7 +3519,7 @@ if test x"$with_ads_support" != x"no"; then
   # now check for krb5.h. Some systems have the libraries without the headers!
   # note that this check is done here to allow for different kerberos
   # include paths
-  AC_CHECK_HEADERS(krb5.h krb5/krb5.h)
+  AC_CHECK_HEADERS(krb5.h)
 
   if test x"$ac_cv_header_krb5_h" = x"no"; then
 
@@ -3541,8 +3541,8 @@ if test x"$with_ads_support" != x"no"; then
     LDFLAGS=$ac_save_LDFLAGS
   fi
   AC_CHECK_HEADERS([krb5/locate_plugin.h], [], [],
-[[#ifdef HAVE_KRB5_KRB5_H
- #include <krb5/krb5.h>
+[[#ifdef HAVE_KRB5_H
+ #include <krb5.h>
  #endif
 ]])
 

diff --git a/source/nsswitch/winbind_krb5_locator.c b/source/nsswitch/winbind_krb5_locator.c
index 272e7dbab153bacc2a28a468e88a31bbce23228f..db6e8d0d6cf0593302fe1023ce5976e8e89c9343 100644 (file)
--- a/source/nsswitch/winbind_krb5_locator.c
+++ b/source/nsswitch/winbind_krb5_locator.c
@@ -26,7 +26,11 @@
 
 #if defined(HAVE_KRB5) && defined(HAVE_KRB5_LOCATE_PLUGIN_H)
 
-#include <krb5/krb5.h>
+#if HAVE_COM_ERR_H
+#include <com_err.h>
+#endif
+
+#include <krb5.h>
 #include <krb5/locate_plugin.h>
 
 #ifndef KRB5_PLUGIN_NO_HANDLE