diff options
| author | Günther Deschner <gd@samba.org> | 2009-11-26 10:15:45 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-11-26 10:15:45 +0100 |
| commit | 5b3a32be97a37c119e837bdee8f049684565458c (patch) | |
| tree | d9310bedfa264920fb73b5e446fc6fc9077b68f2 | |
| parent | 60419a0eb72c2e07c4b882727b2ccb01b73c52e6 (diff) | |
| download | samba-5b3a32be97a37c119e837bdee8f049684565458c.tar.gz samba-5b3a32be97a37c119e837bdee8f049684565458c.tar.bz2 samba-5b3a32be97a37c119e837bdee8f049684565458c.zip | |
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
| -rw-r--r-- | nsswitch/winbind_krb5_locator.c | 6 | ||||
| -rw-r--r-- | source3/configure.in | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/nsswitch/winbind_krb5_locator.c b/nsswitch/winbind_krb5_locator.c index 272e7dbab1..db6e8d0d6c 100644 --- a/nsswitch/winbind_krb5_locator.c +++ b/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 diff --git a/source3/configure.in b/source3/configure.in index f624e0ef5d..29016c5d86 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -3329,7 +3329,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 @@ -3351,8 +3351,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 ]]) |