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/auth | |
| 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/auth')
| -rw-r--r-- | source4/auth/gensec/config.m4 | 2 | ||||
| -rw-r--r-- | source4/auth/gensec/config.mk | 5 | ||||
| -rw-r--r-- | source4/auth/kerberos/config.m4 | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source4/auth/gensec/config.m4 b/source4/auth/gensec/config.m4 index 4565ce0b97..af17e896a4 100644 --- a/source4/auth/gensec/config.m4 +++ b/source4/auth/gensec/config.m4 @@ -1,7 +1,7 @@ SMB_MODULE_DEFAULT(gensec_krb5, NOT) SMB_MODULE_DEFAULT(gensec_gssapi, NOT) -if test x"$SMB_EXT_LIB_ENABLE_KRB5" = x"YES"; then +if test x"$HAVE_KRB5" = x"YES"; then # krb5 is now disabled at runtime, not build time SMB_MODULE_DEFAULT(gensec_krb5, STATIC) SMB_MODULE_DEFAULT(gensec_gssapi, STATIC) diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk index f8d1928585..34587e2e45 100644 --- a/source4/auth/gensec/config.mk +++ b/source4/auth/gensec/config.mk @@ -14,8 +14,7 @@ REQUIRED_SUBSYSTEMS = \ SUBSYSTEM = GENSEC INIT_FUNCTION = gensec_krb5_init INIT_OBJ_FILES = auth/gensec/gensec_krb5.o -REQUIRED_SUBSYSTEMS = NDR_KRB5PAC KERBEROS EXT_LIB_KRB5 AUTH - +REQUIRED_SUBSYSTEMS = NDR_KRB5PAC KERBEROS KERBEROS_LIB AUTH # End MODULE gensec_krb5 ################################################ @@ -25,7 +24,7 @@ REQUIRED_SUBSYSTEMS = NDR_KRB5PAC KERBEROS EXT_LIB_KRB5 AUTH SUBSYSTEM = GENSEC INIT_FUNCTION = gensec_gssapi_init INIT_OBJ_FILES = auth/gensec/gensec_gssapi.o -REQUIRED_SUBSYSTEMS = EXT_LIB_KRB5 AUTH +REQUIRED_SUBSYSTEMS = KERBEROS_LIB AUTH # End MODULE gensec_gssapi ################################################ diff --git a/source4/auth/kerberos/config.m4 b/source4/auth/kerberos/config.m4 index d88fc78554..bbb57bdd47 100644 --- a/source4/auth/kerberos/config.m4 +++ b/source4/auth/kerberos/config.m4 @@ -1,3 +1,5 @@ +# NOTE! this whole m4 file is disabled in configure.in for now + ################################################# # KRB5 support KRB5_CFLAGS="" |