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/kdc | |
| 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/kdc')
| -rw-r--r-- | source4/kdc/config.m4 | 2 | ||||
| -rw-r--r-- | source4/kdc/config.mk | 2 | ||||
| -rw-r--r-- | source4/kdc/kdc.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/kdc/config.m4 b/source4/kdc/config.m4 index 1408a858f4..c086b27936 100644 --- a/source4/kdc/config.m4 +++ b/source4/kdc/config.m4 @@ -1,5 +1,5 @@ SMB_MODULE_DEFAULT(server_service_kdc, NOT) -if test t$SMB_EXT_LIB_ENABLE_KDC = tYES; then +if test t$HAVE_KRB5 = tYES; then SMB_MODULE_DEFAULT(server_service_kdc, STATIC) fi diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk index 3b227584ff..b1de650faa 100644 --- a/source4/kdc/config.mk +++ b/source4/kdc/config.mk @@ -7,6 +7,6 @@ INIT_OBJ_FILES = \ kdc/kdc.o \ kdc/hdb-ldb.o REQUIRED_SUBSYSTEMS = \ - LIBLDB EXT_LIB_KRB5 EXT_LIB_KDC + LIBLDB KERBEROS_LIB # End SUBSYSTEM KDC ####################### diff --git a/source4/kdc/kdc.h b/source4/kdc/kdc.h index d766e21e6e..25f643eadd 100644 --- a/source4/kdc/kdc.h +++ b/source4/kdc/kdc.h @@ -23,7 +23,7 @@ #include "system/kerberos.h" #include "auth/kerberos/kerberos.h" -#include <kdc.h> +#include "heimdal/kdc/kdc.h" krb5_error_code hdb_ldb_create(krb5_context context, struct HDB **db, const char *arg); |