From 1114a6f46d645e674ea362a771beb8498ba79855 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 26 Nov 2009 10:15:45 +0100
Subject: 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)
---
 source/configure.in                    | 6 +++---
 source/nsswitch/winbind_krb5_locator.c | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/source/configure.in b/source/configure.in
index ead0e29fa0d..1092d00b17d 100644
--- 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 272e7dbab15..db6e8d0d6cf 100644
--- 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
-- 
cgit