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/heimdal_build/config.h | |
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/heimdal_build/config.h')
-rw-r--r-- | source4/heimdal_build/config.h | 47 |
1 files changed, 42 insertions, 5 deletions
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h index 375239c459..ba6da4b35d 100644 --- a/source4/heimdal_build/config.h +++ b/source4/heimdal_build/config.h @@ -6,6 +6,8 @@ /* bring in the samba4 config.h */ #include "include/config.h" +#ifdef HAVE_KRB5 + #define RCSID(msg) \ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg } @@ -22,17 +24,52 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg } /* path to sysconf - should we force this to samba LIBDIR ? */ #define SYSCONFDIR "/etc" -#define KRB5 /* Maximum values on all known systems */ #define MaxHostNameLen (64+4) #define MaxPathLen (1024+4) -#define HAVE_H_ERRNO +#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4 0.7rc1"} -#define HAVE_LONG_LONG 1 +/* even if we do have dlopen, we don't want heimdal using it */ +#undef HAVE_DLOPEN -#define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4 0.7rc1"} +#define VERSION "Samba" +#define ROKEN_LIB_FUNCTION -#undef HAVE_DLOPEN +/* these should be done with configure tests */ +#define HAVE_H_ERRNO +#define HAVE_INET_ATON +#define HAVE_LONG_LONG +#define HAVE_GETHOSTNAME +#define HAVE_SOCKLEN_T +#define HAVE_GETNAMEINFO +#define HAVE_STRUCT_WINSIZE +#define HAVE_STRUCT_SOCKADDR_STORAGE +#define HAVE_STRUCT_ADDRINFO +#define HAVE_GAI_STRERROR + +/* setup correct defines for capabilities of our version of heimdal */ +#define KRB5 +#define HAVE_KRB5_SET_REAL_TIME +#define HAVE_KRB5_LOG_CONTROL +#define HAVE_KRB5_INITLOG +#define HAVE_KRB5_ADDLOG_FUNC +#define HAVE_KRB5_FREELOG +#define HAVE_KRB5_SET_WARN_DEST +#define HAVE_KRB5_LOG_FACILITY +#define HAVE_KRB5_AUTH_CON_SETKEY +#define HAVE_ADDR_TYPE_IN_KRB5_ADDRESS +#define HAVE_KRB5_GET_PW_SALT +#define HAVE_KRB5_STRING_TO_KEY_SALT +#define HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES +#define HAVE_KRB5_SESSION_IN_CREDS +#define HAVE_KRB5_KEYBLOCK_KEYVALUE +#define HAVE_KRB5_C_ENCTYPE_COMPARE +#define HAVE_KRB5_KT_FREE_ENTRY +#define HAVE_KRB5_PRINCIPAL_GET_COMP_STRING + +#include <sys/types.h> +#include "lib/replace/replace.h" +#endif |