The branch, master has been updated via 5b3a32b... s3-kerberos: next step to resolve Bug #6929: build with recent heimdal. from 60419a0... s4-smbtorture: refactor RPC-SAMR-LARGE-DC test a little more.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 5b3a32be97a37c119e837bdee8f049684565458c Author: Günther Deschner <g...@samba.org> Date: Thu Nov 26 10:15:45 2009 +0100 s3-kerberos: next step to resolve Bug #6929: build with recent heimdal. Based on patch from Allan <al...@archlinux.org>. Also should fix the FreeBSD build on the buildfarm. Guenther ----------------------------------------------------------------------- Summary of changes: nsswitch/winbind_krb5_locator.c | 6 +++++- source3/configure.in | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/nsswitch/winbind_krb5_locator.c b/nsswitch/winbind_krb5_locator.c index 272e7db..db6e8d0 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 f624e0e..29016c5 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 ]]) -- Samba Shared Repository