diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-06-07 07:22:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:17:45 -0500 |
| commit | bce8cda06123648c377fbef92526f1f56121e513 (patch) | |
| tree | 75e4b2a190c8e3a5efd7c41433d36766ea189179 /source4/include/system | |
| parent | 6eae7eb3c446e26d8003846a79471e6232b1b92e (diff) | |
| download | samba-bce8cda06123648c377fbef92526f1f56121e513.tar.gz samba-bce8cda06123648c377fbef92526f1f56121e513.tar.bz2 samba-bce8cda06123648c377fbef92526f1f56121e513.zip | |
r7352: the internal heimdal build change. This changes quite a few things:
- if you want kerberos now, you need to unpack a lorikeet heimdal
tree in source/heimdal/. If source/heimdal/ does not exist at
configure time then all kerberos features are disabled. You cannot
use an external kerberos library for now. That may change later.
- moved lib/replace/ config stuff to lib/replace/ and create a
lib/replace/replace.h. That allows the heimdal build to use our
portability layer, and prevenets duplicate definitions of functions
like strlcat()
- if you do enable heimdal, then you will need to do 'make
HEIMDAL_EXTERNAL' before you build Samba. That should be fixed once
I explain the problem to jelmer (the problem is the inability to
set a depend without also dragging in the object list of the
dependency. We need this for building the heimdal asn1 compiler and
et compiler.
- disabled all of the m4 checks for external kerberos libraries. I
left them in place in auth/kerberos/, but disabled it in
configure.in
some of the heimdal_build/ code is still very rough, for example I
don't correctly detect the correct awk, flex, bison replacements for
heimdal_build/build_external.sh. I expect to fix that stuff up over
the next few days.
(This used to be commit d4648249b2c7fc8b5e7c0fc8d8f92ae043b5691f)
Diffstat (limited to 'source4/include/system')
| -rw-r--r-- | source4/include/system/kerberos.h | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/source4/include/system/kerberos.h b/source4/include/system/kerberos.h index e0a926300f..98457688f8 100644 --- a/source4/include/system/kerberos.h +++ b/source4/include/system/kerberos.h @@ -20,30 +20,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "heimdal_build/config.h" -#ifdef HAVE_KRB5_H -#include <krb5.h> -#else -#undef HAVE_KRB5 -#endif - -#if defined(HAVE_GSSAPI_H) -# include <gssapi.h> -# ifdef HAVE_GSSAPI_KRB5_H -# include <gssapi_krb5.h> -# endif -#elif defined(HAVE_GSSAPI_GSSAPI_H) -# include <gssapi/gssapi.h> -# if defined(HAVE_GSSAPI_GSSAPI_KRB5_H) -# include <gssapi/gssapi_krb5.h> -# endif -#elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H) -# include <gssapi/gssapi_generic.h> -# if defined(HAVE_GSSAPI_GSSAPI_KRB5_H) -# include <gssapi/gssapi_krb5.h> -# endif -#endif - -#ifdef HAVE_COM_ERR_H -#include <com_err.h> +#ifdef HAVE_KRB5 +#include "heimdal/lib/krb5/krb5.h" +#include "heimdal/lib/gssapi/gssapi.h" +#include "heimdal/lib/com_err/com_err.h" #endif |