From 4a0582438f79347a6233e3e2a30dae692cae655f Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Sun, 8 Jun 2008 19:16:26 -0400 Subject: Make it possible to disable gnutls at configure time, until someone will finally decide to fix it. (This used to be commit 0671dce355432a2a4c08ab010831eadd73e4561e) --- source4/lib/tls/config.m4 | 61 ++++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4 index 8b6ad7dcbc..2af9192cca 100644 --- a/source4/lib/tls/config.m4 +++ b/source4/lib/tls/config.m4 @@ -1,33 +1,44 @@ ############################### # start SMB_EXT_LIB_GNUTLS # check for gnutls/gnutls.h and -lgnutls -SMB_EXT_LIB_FROM_PKGCONFIG(GNUTLS, gnutls, - [SMB_ENABLE_GNUTLS=YES], - [SMB_ENABLE_GNUTLS=NO]) -if test x$SMB_ENABLE_GNUTLS = xNO; then - AC_CHECK_HEADERS(gnutls/gnutls.h) - AC_CHECK_LIB_EXT(gnutls, GNUTLS_LIBS, gnutls_global_init) - AC_CHECK_DECL(gnutls_x509_crt_set_version, - [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_VERSION,1,gnutls set_version)], [], [ - #include - #include - ]) - if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_decl_gnutls_x509_crt_set_version" = x"yes";then - SMB_ENABLE(GNUTLS,YES) - AC_CHECK_DECL(gnutls_x509_crt_set_subject_key_id, - [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID,1,gnutls subject_key)], [], [ - #include - #include - ]) +use_gnutls=yes +AC_ARG_ENABLE(gnutls, +[ --enable-gnutls Turn on gnutls support (default=yes)], + [if test x$enable_gnutls = xno; then + use_gnutls=no + fi]) + + +if test x$use_gnutls = xyes; then + SMB_EXT_LIB_FROM_PKGCONFIG(GNUTLS, gnutls, + [SMB_ENABLE_GNUTLS=YES], + [SMB_ENABLE_GNUTLS=NO]) + + if test x$SMB_ENABLE_GNUTLS = xNO; then + AC_CHECK_HEADERS(gnutls/gnutls.h) + AC_CHECK_LIB_EXT(gnutls, GNUTLS_LIBS, gnutls_global_init) + AC_CHECK_DECL(gnutls_x509_crt_set_version, + [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_VERSION,1,gnutls set_version)], [], [ + #include + #include + ]) + if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_decl_gnutls_x509_crt_set_version" = x"yes";then + SMB_ENABLE(GNUTLS,YES) + AC_CHECK_DECL(gnutls_x509_crt_set_subject_key_id, + [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID,1,gnutls subject_key)], [], [ + #include + #include + ]) + fi + SMB_EXT_LIB(GNUTLS, $GNUTLS_LIBS) + fi + if test x$SMB_ENABLE_GNUTLS = xYES; then + #Some older versions have a different type name + AC_CHECK_TYPES([gnutls_datum],,,[#include "gnutls/gnutls.h"]) + AC_CHECK_TYPES([gnutls_datum_t],,,[#include "gnutls/gnutls.h"]) + AC_DEFINE(ENABLE_GNUTLS,1,[Whether we have gnutls support (SSL)]) fi - SMB_EXT_LIB(GNUTLS, $GNUTLS_LIBS) -fi -if test x$SMB_ENABLE_GNUTLS = xYES; then - #Some older versions have a different type name - AC_CHECK_TYPES([gnutls_datum],,,[#include "gnutls/gnutls.h"]) - AC_CHECK_TYPES([gnutls_datum_t],,,[#include "gnutls/gnutls.h"]) - AC_DEFINE(ENABLE_GNUTLS,1,[Whether we have gnutls support (SSL)]) fi # end SMB_EXT_LIB_GNUTLS ############################### -- cgit From b0d43b862ab909c262d2298e0b344c4eecc0efee Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 9 Jun 2008 10:37:12 +0200 Subject: build/m4: fix warnings with autoconf-2.62 rename SMB_BUILD_ => samba_cv_ AC_CACHE_VAL() variables must contain _cv_ to be cached. metze (This used to be commit 0241af873fdefd5856932190ca0019a2d3c05703) --- source4/build/m4/check_cc.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4 index 569be38721..51531ca776 100644 --- a/source4/build/m4/check_cc.m4 +++ b/source4/build/m4/check_cc.m4 @@ -30,7 +30,7 @@ fi # check if the compiler can handle negative enum values # and don't truncate the values to INT_MAX # a runtime test is needed here -AC_CACHE_CHECK([that the C compiler understands negative enum values],SMB_BUILD_CC_NEGATIVE_ENUM_VALUES, [ +AC_CACHE_CHECK([that the C compiler understands negative enum values],samba_cv_CC_NEGATIVE_ENUM_VALUES, [ AC_TRY_RUN( [ #include @@ -45,8 +45,8 @@ AC_CACHE_CHECK([that the C compiler understands negative enum values],SMB_BUILD_ return 0; } ], - SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes,SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=no)]) -if test x"$SMB_BUILD_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then + samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv_CC_NEGATIVE_ENUM_VALUES=no)]) +if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then AC_DEFINE(USE_UINT_ENUMS, 1, [Whether the compiler has uint enum support]) fi -- cgit From 1b955253ff34f6a8a431899051dd784ace32a9ba Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 9 Jun 2008 10:38:09 +0200 Subject: libreplace: fix warnings with autoconf-2.62 rename ac_ => libreplace_cv_ AC_CACHE_VAL() variables must contain _cv_ to be cached. metze (This used to be commit 67e43860b4973a458676b36785570bb4a66e046a) --- source4/lib/replace/win32.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source4/lib/replace/win32.m4 b/source4/lib/replace/win32.m4 index 9ac84cdf2a..eb364e2cb9 100644 --- a/source4/lib/replace/win32.m4 +++ b/source4/lib/replace/win32.m4 @@ -2,7 +2,7 @@ AC_CHECK_HEADERS(direct.h windows.h winsock2.h ws2tcpip.h) ####################################### # Check for mkdir mode -AC_CACHE_CHECK( [whether mkdir supports mode], ac_mkdir_has_mode, +AC_CACHE_CHECK( [whether mkdir supports mode], libreplace_cv_mkdir_has_mode, AC_TRY_COMPILE([ #include #ifdef HAVE_DIRECT_H @@ -11,10 +11,10 @@ AC_CACHE_CHECK( [whether mkdir supports mode], ac_mkdir_has_mode, mkdir("foo",0777); return 0; ], - ac_mkdir_has_mode="yes", - ac_mkdir_has_mode="no") ) + libreplace_cv_mkdir_has_mode="yes", + libreplace_cv_mkdir_has_mode="no") ) -if test "$ac_mkdir_has_mode" = "yes" +if test "$libreplace_cv_mkdir_has_mode" = "yes" then AC_DEFINE(HAVE_MKDIR_MODE, 1, [Define if target mkdir supports mode option]) fi -- cgit From d54c171a1a120980f075d05823f2c112e80dd097 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 9 Jun 2008 10:39:48 +0200 Subject: libreplace: only include AC_USE_SYSTEM_EXTENSIONS fallback if required This fixes ./autogen.sh with autoconf-2.62 metze (This used to be commit 72bb01dda4d425528e28cd96e249595dc6c1952f) --- source4/lib/replace/libreplace.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4 index 6a85ff5a82..71fa041672 100644 --- a/source4/lib/replace/libreplace.m4 +++ b/source4/lib/replace/libreplace.m4 @@ -299,4 +299,5 @@ m4_include(libreplace_cc.m4) m4_include(libreplace_ld.m4) m4_include(libreplace_network.m4) m4_include(libreplace_macros.m4) -m4_include(autoconf-2.60.m4) + +m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[m4_include(autoconf-2.60.m4)]) -- cgit From 6dc6d480ab16db99b088976a938371bbbe82770d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 9 Jun 2008 10:42:07 +0200 Subject: configure: we require autoconf 2.54 I've tested with autoconf from 2.53 to 2.62. metze (This used to be commit 0dbacbf8be0eacaa4db6477873b7512f7261ef4c) --- source4/configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source4/configure.ac b/source4/configure.ac index 73d3ffd4d9..5014a8700a 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -1,8 +1,7 @@ dnl -*- mode: m4-mode -*- dnl Process this file with autoconf to produce a configure script. -dnl disabled 2.53 requirement - we do work with 2.52 on suse 7.3 for example -dnl AC_PREREQ(2.53) +AC_PREREQ(2.54) AC_INIT([samba],[4],[samba-technical@samba.org]) -- cgit From 1384f836b601d35f3c499a9e26c3e3b0d12b3ad0 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 5 Jun 2008 19:13:23 +0000 Subject: heimdal_build: rename config.m{k,4} => internal.m{k,4} metze (This used to be commit 33700d4a97e14aab1b45b3ddb8c80c48cd789bc6) --- source4/configure.ac | 2 +- source4/heimdal_build/config.m4 | 256 ---------------- source4/heimdal_build/config.mk | 624 -------------------------------------- source4/heimdal_build/internal.m4 | 256 ++++++++++++++++ source4/heimdal_build/internal.mk | 624 ++++++++++++++++++++++++++++++++++++++ source4/main.mk | 2 +- 6 files changed, 882 insertions(+), 882 deletions(-) delete mode 100644 source4/heimdal_build/config.m4 delete mode 100644 source4/heimdal_build/config.mk create mode 100644 source4/heimdal_build/internal.m4 create mode 100644 source4/heimdal_build/internal.mk diff --git a/source4/configure.ac b/source4/configure.ac index 5014a8700a..7690e700a5 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -13,7 +13,7 @@ AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h]) m4_include(build/m4/env.m4) m4_include(lib/replace/samba.m4) m4_include(lib/smbreadline/readline.m4) -m4_include(heimdal_build/config.m4) +m4_include(heimdal_build/internal.m4) m4_include(lib/util/fault.m4) m4_include(lib/util/signal.m4) m4_include(lib/util/util.m4) diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4 deleted file mode 100644 index 18ecbb75cd..0000000000 --- a/source4/heimdal_build/config.m4 +++ /dev/null @@ -1,256 +0,0 @@ -m4_define([upcase],`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`)dnl - -dnl love_FIND_FUNC(func, includes, arguments) -dnl kind of like AC_CHECK_FUNC, but with headerfiles -AC_DEFUN([love_FIND_FUNC], [ - -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(ac_cv_love_func_$1, -[ -AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2]],[[$1($3)]])], -[eval "ac_cv_love_func_$1=yes"],[eval "ac_cv_love_func_$1=no"])]) - -eval "ac_res=\$ac_cv_love_func_$1" - -if false; then - AC_CHECK_FUNCS($1) -fi -# $1 -eval "ac_tr_func=HAVE_[]upcase($1)" - -case "$ac_res" in - yes) - AC_DEFINE_UNQUOTED($ac_tr_func) - AC_MSG_RESULT([yes]) - ;; - no) - AC_MSG_RESULT([no]) - ;; -esac - - -]) - -dnl Not all systems have err.h, so we provide a replacement. Heimdal -dnl unconditionally #includes , so we need to create an err.h, -dnl but we can't just have a static one because we don't want to use -dnl it on systems that have a real err.h. If the system has a real -dnl err.h, we should use that (eg. on Darwin, the declarations get -dnl linker attributes added, so we can't guarantee that our local -dnl declarations will be correct). Phew! -AC_CHECK_HEADERS([err.h], [], - [ cp heimdal/lib/roken/err.hin heimdal_build/err.h ]) - -AC_CHECK_HEADERS([ \ - crypt.h \ - curses.h \ - errno.h \ - inttypes.h \ - netdb.h \ - signal.h \ - sys/bswap.h \ - sys/file.h \ - sys/stropts.h \ - sys/timeb.h \ - sys/times.h \ - sys/uio.h \ - sys/un.h \ - sys/utsname.h \ - term.h \ - termcap.h \ - time.h \ - timezone.h \ - ttyname.h \ - netinet/in.h \ - netinet/in6.h \ - netinet6/in6.h -]) - -AC_CHECK_FUNCS([ \ - atexit \ - cgetent \ - getprogname \ - inet_aton \ - gethostname \ - getnameinfo \ - iruserok \ - putenv \ - rcmd \ - readv \ - sendmsg \ - setitimer \ - socket \ - strlwr \ - strncasecmp \ - strptime \ - strsep \ - strsep_copy \ - strtok_r \ - strupr \ - swab \ - umask \ - uname \ - unsetenv \ - closefrom \ - hstrerror \ - err \ - warn \ - errx \ - warnx \ - flock \ - getipnodebyname \ - getipnodebyaddr \ - freehostent \ - writev -]) - -love_FIND_FUNC(bswap16, [#ifdef HAVE_SYS_BSWAP_H -#include -#endif], 0) - -love_FIND_FUNC(bswap32, [#ifdef HAVE_SYS_BSWAP_H -#include -#endif], 0) - -AC_DEFUN([AC_KRB_STRUCT_WINSIZE], [ -AC_MSG_CHECKING(for struct winsize) -AC_CACHE_VAL(ac_cv_struct_winsize, [ -ac_cv_struct_winsize=no -for i in sys/termios.h sys/ioctl.h; do -AC_EGREP_HEADER( -struct[[ ]]*winsize,dnl -$i, ac_cv_struct_winsize=yes; break)dnl -done -]) -if test "$ac_cv_struct_winsize" = "yes"; then - AC_DEFINE(HAVE_STRUCT_WINSIZE, 1, [define if struct winsize is declared in sys/termios.h]) -fi -AC_MSG_RESULT($ac_cv_struct_winsize) -AC_EGREP_HEADER(ws_xpixel, termios.h, - AC_DEFINE(HAVE_WS_XPIXEL, 1, [define if struct winsize has ws_xpixel])) -AC_EGREP_HEADER(ws_ypixel, termios.h, - AC_DEFINE(HAVE_WS_YPIXEL, 1, [define if struct winsize has ws_ypixel])) -]) - -AC_KRB_STRUCT_WINSIZE - -AC_TYPE_SIGNAL -if test "$ac_cv_type_signal" = "void" ; then - AC_DEFINE(VOID_RETSIGTYPE, 1, [Define if signal handlers return void.]) -fi -AC_SUBST(VOID_RETSIGTYPE) - - -m4_include(heimdal/cf/check-var.m4) - -rk_CHECK_VAR(h_errno, -[#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_NETDB_H -#include -#endif]) - -m4_include(heimdal/cf/find-func.m4) -m4_include(heimdal/cf/find-func-no-libs.m4) -m4_include(heimdal/cf/find-func-no-libs2.m4) -m4_include(heimdal/cf/resolv.m4) - -smb_save_LIBS=$LIBS -RESOLV_LIBS="" -LIBS="" - -dnl This fills in the global LIBS... -rk_RESOLV - -dnl AC_CHECK_LIB_EXT(resolv, RESOLV_LIBS, res_search) - SMB_ENABLE(RESOLV,YES) - -if test x"$LIBS" != "x"; then - RESOLV_LIBS=$LIBS -fi - -LIBS=$smb_save_LIBS - -SMB_EXT_LIB(RESOLV,[${RESOLV_LIBS}],[${RESOLV_CFLAGS}],[${RESOLV_CPPFLAGS}],[${RESOLV_LDFLAGS}]) - - -# these are disabled unless heimdal is found below -SMB_ENABLE(KERBEROS_LIB, NO) -SMB_ENABLE(asn1_compile, NO) -SMB_ENABLE(compile_et, NO) - -# -# We need bison -y and flex in new versions -# Otherwise we get random runtime failures -# -LEX_YACC_COMBINATIONS="" -LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.33:bison-2.3" - -AC_PROG_LEX -LEX_BASENAME=`basename "$LEX"` -if test x"$LEX_BASENAME" = x"flex"; then - # "flex 2.5.33" - FLEX_VERSION=`$LEX --version | cut -d ' ' -f2` - AC_MSG_CHECKING(flex version) - AC_MSG_RESULT($FLEX_VERSION) - FLEX_MAJOR=`echo $FLEX_VERSION | cut -d '.' -f1` - FLEX_MINOR=`echo $FLEX_VERSION | cut -d '.' -f2` - FLEX_RELEASE=`echo $FLEX_VERSION | cut -d '.' -f3` - - LEX_VERSION="flex-$FLEX_MAJOR.$FLEX_MINOR.$FLEX_RELEASE" -fi - -AC_PROG_YACC -YACC_BASENAME=`basename "$YACC"` -if test x"$YACC_BASENAME" = x"bison -y"; then - # bison (GNU Bison) 2.3 - BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4` - AC_MSG_CHECKING(bison version) - AC_MSG_RESULT($BISON_VERSION) - BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1` - BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2` - - YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR" -fi - -AC_MSG_CHECKING(working LEX YACC combination) -LEX_YACC="no" -if test x"$LEX_VERSION" != x"" -a x"$YACC_VERSION" != x""; then - V="$LEX_VERSION:$YACC_VERSION" - for C in $LEX_YACC_COMBINATIONS; do - if test x"$V" = x"$C"; then - LEX_YACC=$V - break; - fi - done -fi -if test x"$LEX_YACC" = x"no"; then - LEX=false - YACC=false -fi -AC_MSG_RESULT($LEX_YACC) - -# Portions of heimdal kerberos are unpacked into source/heimdal -# of the samba source tree. - -# if we ever get to using a host kerberos, we might add conditionals here -AC_DEFINE(HAVE_KRB5,1,[Whether kerberos is available]) -HAVE_KRB5=YES -SMB_ENABLE(KERBEROS_LIB, YES) -SMB_ENABLE(asn1_compile, YES) -SMB_ENABLE(compile_et, YES) - -# only add closefrom if needed -SMB_ENABLE(HEIMDAL_ROKEN_CLOSEFROM, NO) -if test t$ac_cv_func_closefrom != tyes; then - SMB_ENABLE(HEIMDAL_ROKEN_CLOSEFROM, YES) -fi - -# only add getprogname if needed -SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME, NO) -SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME_H, NO) -if test t$ac_cv_func_getprogname != tyes; then - SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME, YES) - SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME_H, YES) -fi diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk deleted file mode 100644 index 17fc8c93ec..0000000000 --- a/source4/heimdal_build/config.mk +++ /dev/null @@ -1,624 +0,0 @@ -heimdalbuildsrcdir = $(heimdalsrcdir)/../heimdal_build - -####################### -# Start SUBSYSTEM HEIMDAL_KDC -[SUBSYSTEM::HEIMDAL_KDC] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/kdc -PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 HEIMDAL_HDB HEIMDAL_HEIM_ASN1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 -PUBLIC_DEPENDENCIES = HEIMDAL_NTLM HEIMDAL_HCRYPTO -# End SUBSYSTEM HEIMDAL_KDC -####################### - - -HEIMDAL_KDC_OBJ_FILES = \ - $(heimdalsrcdir)/kdc/default_config.o \ - $(heimdalsrcdir)/kdc/kerberos5.o \ - $(heimdalsrcdir)/kdc/krb5tgs.o \ - $(heimdalsrcdir)/kdc/pkinit.o \ - $(heimdalsrcdir)/kdc/log.o \ - $(heimdalsrcdir)/kdc/misc.o \ - $(heimdalsrcdir)/kdc/524.o \ - $(heimdalsrcdir)/kdc/kerberos4.o \ - $(heimdalsrcdir)/kdc/kaserver.o \ - $(heimdalsrcdir)/kdc/digest.o \ - $(heimdalsrcdir)/kdc/process.o \ - $(heimdalsrcdir)/kdc/windc.o \ - $(heimdalsrcdir)/kdc/kx509.o - -[SUBSYSTEM::HEIMDAL_NTLM] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/ntlm -PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5 - -HEIMDAL_NTLM_OBJ_FILES = \ - $(heimdalsrcdir)/lib/ntlm/ntlm.o - -[SUBSYSTEM::HEIMDAL_HDB_KEYS] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hdb -PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5 \ - HEIMDAL_HDB_ASN1 - -HEIMDAL_HDB_KEYS_OBJ_FILES = $(heimdalsrcdir)/lib/hdb/keys.o - -####################### -# Start SUBSYSTEM HEIMDAL_HDB -[SUBSYSTEM::HEIMDAL_HDB] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hdb -PRIVATE_DEPENDENCIES = HDB_LDB HEIMDAL_KRB5 HEIMDAL_HDB_KEYS HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_COM_ERR HEIMDAL_HDB_ASN1 -# End SUBSYSTEM HEIMDAL_HDB -####################### - -HEIMDAL_HDB_OBJ_FILES = \ - $(heimdalsrcdir)/lib/hdb/db.o \ - $(heimdalsrcdir)/lib/hdb/dbinfo.o \ - $(heimdalsrcdir)/lib/hdb/hdb.o \ - $(heimdalsrcdir)/lib/hdb/ext.o \ - $(heimdalsrcdir)/lib/hdb/keytab.o \ - $(heimdalsrcdir)/lib/hdb/mkey.o \ - $(heimdalsrcdir)/lib/hdb/ndbm.o \ - $(heimdalsrcdir)/lib/hdb/hdb_err.o - -####################### -# Start SUBSYSTEM HEIMDAL_GSSAPI -[SUBSYSTEM::HEIMDAL_GSSAPI] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/gssapi -I$(heimdalsrcdir)/lib/gssapi/gssapi -I$(heimdalsrcdir)/lib/gssapi/spnego -I$(heimdalsrcdir)/lib/gssapi/krb5 -I$(heimdalsrcdir)/lib/gssapi/mech -PRIVATE_DEPENDENCIES = HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1 -PUBLIC_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 -# End SUBSYSTEM HEIMDAL_GSSAPI -####################### - -HEIMDAL_GSSAPI_OBJ_FILES = \ - $(heimdalsrcdir)/lib/gssapi/mech/context.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_krb5.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_mech_switch.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_process_context_token.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_buffer_set.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_add_cred.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_add_oid_set_member.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_compare_name.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_release_oid_set.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_create_empty_oid_set.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_decapsulate_token.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_cred_by_oid.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_canonicalize_name.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_sec_context_by_oid.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_names_for_mech.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_mechs_for_name.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_wrap_size_limit.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_names.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_verify.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_display_name.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_duplicate_oid.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_display_status.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_release_buffer.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_release_oid.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_test_oid_set_member.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_release_cred.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_set_sec_context_option.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_export_name.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_seal.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_acquire_cred.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_unseal.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_verify_mic.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_accept_sec_context.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_cred_by_mech.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_indicate_mechs.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_delete_sec_context.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_sign.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_utils.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_init_sec_context.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_oid_equal.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_oid_to_str.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_context_time.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_encapsulate_token.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_get_mic.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_import_sec_context.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_cred.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_wrap.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_import_name.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_duplicate_name.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_unwrap.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_export_sec_context.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_context.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_release_name.o \ - $(heimdalsrcdir)/lib/gssapi/mech/gss_set_cred_option.o \ - $(heimdalsrcdir)/lib/gssapi/asn1_GSSAPIContextToken.o \ - $(heimdalsrcdir)/lib/gssapi/spnego/init_sec_context.o \ - $(heimdalsrcdir)/lib/gssapi/spnego/external.o \ - $(heimdalsrcdir)/lib/gssapi/spnego/compat.o \ - $(heimdalsrcdir)/lib/gssapi/spnego/context_stubs.o \ - $(heimdalsrcdir)/lib/gssapi/spnego/cred_stubs.o \ - $(heimdalsrcdir)/lib/gssapi/spnego/accept_sec_context.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/copy_ccache.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/delete_sec_context.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/init_sec_context.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/context_time.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/init.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/address_to_krb5addr.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/get_mic.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/inquire_context.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/add_cred.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/inquire_cred.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/inquire_cred_by_oid.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/inquire_cred_by_mech.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/inquire_mechs_for_name.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/inquire_names_for_mech.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/indicate_mechs.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/inquire_sec_context_by_oid.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/export_sec_context.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/import_sec_context.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/duplicate_name.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/import_name.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/compare_name.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/export_name.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/canonicalize_name.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/unwrap.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/wrap.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/release_name.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/cfx.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/8003.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/arcfour.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/encapsulate.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/display_name.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/sequence.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/display_status.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/release_buffer.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/external.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/compat.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/acquire_cred.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/release_cred.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/set_cred_option.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/decapsulate.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/verify_mic.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/accept_sec_context.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/set_sec_context_option.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/process_context_token.o \ - $(heimdalsrcdir)/lib/gssapi/krb5/prf.o - - -####################### -# Start SUBSYSTEM HEIMDAL_KRB5 -[SUBSYSTEM::HEIMDAL_KRB5] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err -PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND -PUBLIC_DEPENDENCIES = HEIMDAL_KRB5_ASN1 HEIMDAL_GLUE HEIMDAL_HX509 HEIMDAL_HCRYPTO -# End SUBSYSTEM HEIMDAL_KRB5 -####################### - -HEIMDAL_KRB5_OBJ_FILES = \ - $(heimdalsrcdir)/lib/krb5/acache.o \ - $(heimdalsrcdir)/lib/krb5/add_et_list.o \ - $(heimdalsrcdir)/lib/krb5/addr_families.o \ - $(heimdalsrcdir)/lib/krb5/appdefault.o \ - $(heimdalsrcdir)/lib/krb5/asn1_glue.o \ - $(heimdalsrcdir)/lib/krb5/auth_context.o \ - $(heimdalsrcdir)/lib/krb5/build_ap_req.o \ - $(heimdalsrcdir)/lib/krb5/build_auth.o \ - $(heimdalsrcdir)/lib/krb5/cache.o \ - $(heimdalsrcdir)/lib/krb5/changepw.o \ - $(heimdalsrcdir)/lib/krb5/codec.o \ - $(heimdalsrcdir)/lib/krb5/config_file.o \ - $(heimdalsrcdir)/lib/krb5/config_file_netinfo.o \ - $(heimdalsrcdir)/lib/krb5/constants.o \ - $(heimdalsrcdir)/lib/krb5/context.o \ - $(heimdalsrcdir)/lib/krb5/convert_creds.o \ - $(heimdalsrcdir)/lib/krb5/copy_host_realm.o \ - $(heimdalsrcdir)/lib/krb5/crc.o \ - $(heimdalsrcdir)/lib/krb5/creds.o \ - $(heimdalsrcdir)/lib/krb5/crypto.o \ - $(heimdalsrcdir)/lib/krb5/data.o \ - $(heimdalsrcdir)/lib/krb5/eai_to_heim_errno.o \ - $(heimdalsrcdir)/lib/krb5/error_string.o \ - $(heimdalsrcdir)/lib/krb5/expand_hostname.o \ - $(heimdalsrcdir)/lib/krb5/fcache.o \ - $(heimdalsrcdir)/lib/krb5/free.o \ - $(heimdalsrcdir)/lib/krb5/free_host_realm.o \ - $(heimdalsrcdir)/lib/krb5/generate_seq_number.o \ - $(heimdalsrcdir)/lib/krb5/generate_subkey.o \ - $(heimdalsrcdir)/lib/krb5/get_cred.o \ - $(heimdalsrcdir)/lib/krb5/get_default_principal.o \ - $(heimdalsrcdir)/lib/krb5/get_default_realm.o \ - $(heimdalsrcdir)/lib/krb5/get_for_creds.o \ - $(heimdalsrcdir)/lib/krb5/get_host_realm.o \ - $(heimdalsrcdir)/lib/krb5/get_in_tkt.o \ - $(heimdalsrcdir)/lib/krb5/get_in_tkt_with_keytab.o \ - $(heimdalsrcdir)/lib/krb5/get_port.o \ - $(heimdalsrcdir)/lib/krb5/init_creds.o \ - $(heimdalsrcdir)/lib/krb5/init_creds_pw.o \ - $(heimdalsrcdir)/lib/krb5/kcm.o \ - $(heimdalsrcdir)/lib/krb5/keyblock.o \ - $(heimdalsrcdir)/lib/krb5/keytab.o \ - $(heimdalsrcdir)/lib/krb5/keytab_any.o \ - $(heimdalsrcdir)/lib/krb5/keytab_file.o \ - $(heimdalsrcdir)/lib/krb5/keytab_memory.o \ - $(heimdalsrcdir)/lib/krb5/keytab_keyfile.o \ - $(heimdalsrcdir)/lib/krb5/keytab_krb4.o \ - $(heimdalsrcdir)/lib/krb5/krbhst.o \ - $(heimdalsrcdir)/lib/krb5/log.o \ - $(heimdalsrcdir)/lib/krb5/mcache.o \ - $(heimdalsrcdir)/lib/krb5/misc.o \ - $(heimdalsrcdir)/lib/krb5/mk_error.o \ - $(heimdalsrcdir)/lib/krb5/mk_priv.o \ - $(heimdalsrcdir)/lib/krb5/mk_rep.o \ - $(heimdalsrcdir)/lib/krb5/mk_req.o \ - $(heimdalsrcdir)/lib/krb5/mk_req_ext.o \ - $(heimdalsrcdir)/lib/krb5/mit_glue.o \ - $(heimdalsrcdir)/lib/krb5/n-fold.o \ - $(heimdalsrcdir)/lib/krb5/padata.o \ - $(heimdalsrcdir)/lib/krb5/pkinit.o \ - $(heimdalsrcdir)/lib/krb5/plugin.o \ - $(heimdalsrcdir)/lib/krb5/principal.o \ - $(heimdalsrcdir)/lib/krb5/pac.o \ - $(heimdalsrcdir)/lib/krb5/prompter_posix.o \ - $(heimdalsrcdir)/lib/krb5/rd_cred.o \ - $(heimdalsrcdir)/lib/krb5/rd_error.o \ - $(heimdalsrcdir)/lib/krb5/rd_priv.o \ - $(heimdalsrcdir)/lib/krb5/rd_rep.o \ - $(heimdalsrcdir)/lib/krb5/rd_req.o \ - $(heimdalsrcdir)/lib/krb5/replay.o \ - $(heimdalsrcdir)/lib/krb5/send_to_kdc.o \ - $(heimdalsrcdir)/lib/krb5/set_default_realm.o \ - $(heimdalsrcdir)/lib/krb5/store.o \ - $(heimdalsrcdir)/lib/krb5/store_emem.o \ - $(heimdalsrcdir)/lib/krb5/store_fd.o \ - $(heimdalsrcdir)/lib/krb5/store_mem.o \ - $(heimdalsrcdir)/lib/krb5/ticket.o \ - $(heimdalsrcdir)/lib/krb5/time.o \ - $(heimdalsrcdir)/lib/krb5/transited.o \ - $(heimdalsrcdir)/lib/krb5/v4_glue.o \ - $(heimdalsrcdir)/lib/krb5/version.o \ - $(heimdalsrcdir)/lib/krb5/warn.o \ - $(heimdalsrcdir)/lib/krb5/krb5_err.o \ - $(heimdalsrcdir)/lib/krb5/heim_err.o \ - $(heimdalsrcdir)/lib/krb5/k524_err.o \ - $(heimdalsrcdir)/lib/krb5/krb_err.o - -####################### -# Start SUBSYSTEM HEIMDAL_HEIM_ASN1 -[SUBSYSTEM::HEIMDAL_HEIM_ASN1] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_COM_ERR -# End SUBSYSTEM HEIMDAL_KRB5 -####################### - -HEIMDAL_HEIM_ASN1_OBJ_FILES = \ - $(heimdalsrcdir)/lib/asn1/der_get.o \ - $(heimdalsrcdir)/lib/asn1/der_put.o \ - $(heimdalsrcdir)/lib/asn1/der_free.o \ - $(heimdalsrcdir)/lib/asn1/der_format.o \ - $(heimdalsrcdir)/lib/asn1/der_length.o \ - $(heimdalsrcdir)/lib/asn1/der_copy.o \ - $(heimdalsrcdir)/lib/asn1/der_cmp.o \ - $(heimdalsrcdir)/lib/asn1/extra.o \ - $(heimdalsrcdir)/lib/asn1/timegm.o \ - $(heimdalsrcdir)/lib/asn1/asn1_err.o - -####################### -# Start SUBSYSTEM HEIMDAL_HCRYPTO_IMATH -[SUBSYSTEM::HEIMDAL_HCRYPTO_IMATH] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hcrypto/imath -PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN -# End SUBSYSTEM HEIMDAL_HCRYPTO_IMATH -####################### - -HEIMDAL_HCRYPTO_IMATH_OBJ_FILES = \ - $(heimdalsrcdir)/lib/hcrypto/imath/imath.o \ - $(heimdalsrcdir)/lib/hcrypto/imath/iprime.o - -[SUBSYSTEM::HEIMDAL_HCRYPTO] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hcrypto -I$(heimdalsrcdir)/lib -PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO_IMATH HEIMDAL_RFC2459_ASN1 -# End SUBSYSTEM HEIMDAL_HCRYPTO -####################### - -HEIMDAL_HCRYPTO_OBJ_FILES = \ - $(heimdalsrcdir)/lib/hcrypto/aes.o \ - $(heimdalsrcdir)/lib/hcrypto/bn.o \ - $(heimdalsrcdir)/lib/hcrypto/dh.o \ - $(heimdalsrcdir)/lib/hcrypto/dh-imath.o \ - $(heimdalsrcdir)/lib/hcrypto/des.o \ - $(heimdalsrcdir)/lib/hcrypto/dsa.o \ - $(heimdalsrcdir)/lib/hcrypto/engine.o \ - $(heimdalsrcdir)/lib/hcrypto/md2.o \ - $(heimdalsrcdir)/lib/hcrypto/md4.o \ - $(heimdalsrcdir)/lib/hcrypto/md5.o \ - $(heimdalsrcdir)/lib/hcrypto/rsa.o \ - $(heimdalsrcdir)/lib/hcrypto/rsa-imath.o \ - $(heimdalsrcdir)/lib/hcrypto/rc2.o \ - $(heimdalsrcdir)/lib/hcrypto/rc4.o \ - $(heimdalsrcdir)/lib/hcrypto/rijndael-alg-fst.o \ - $(heimdalsrcdir)/lib/hcrypto/rnd_keys.o \ - $(heimdalsrcdir)/lib/hcrypto/sha.o \ - $(heimdalsrcdir)/lib/hcrypto/sha256.o \ - $(heimdalsrcdir)/lib/hcrypto/ui.o \ - $(heimdalsrcdir)/lib/hcrypto/evp.o \ - $(heimdalsrcdir)/lib/hcrypto/pkcs5.o \ - $(heimdalsrcdir)/lib/hcrypto/pkcs12.o \ - $(heimdalsrcdir)/lib/hcrypto/rand.o \ - $(heimdalsrcdir)/lib/hcrypto/rand-egd.o \ - $(heimdalsrcdir)/lib/hcrypto/rand-unix.o \ - $(heimdalsrcdir)/lib/hcrypto/rand-fortuna.o \ - $(heimdalsrcdir)/lib/hcrypto/rand-timer.o \ - $(heimdalsrcdir)/lib/hcrypto/hmac.o \ - $(heimdalsrcdir)/lib/hcrypto/camellia.o \ - $(heimdalsrcdir)/lib/hcrypto/camellia-ntt.o - -####################### -# Start SUBSYSTEM HEIMDAL_HX509 -[SUBSYSTEM::HEIMDAL_HX509] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hx509 -PRIVATE_DEPENDENCIES = \ - HEIMDAL_ROKEN HEIMDAL_COM_ERR \ - HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO \ - HEIMDAL_CMS_ASN1 HEIMDAL_RFC2459_ASN1 \ - HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 \ - HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1 \ - HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1 \ - HEIMDAL_WIND -# End SUBSYSTEM HEIMDAL_HX509 -####################### - -HEIMDAL_HX509_OBJ_FILES = \ - $(heimdalsrcdir)/lib/hx509/ca.o \ - $(heimdalsrcdir)/lib/hx509/cert.o \ - $(heimdalsrcdir)/lib/hx509/cms.o \ - $(heimdalsrcdir)/lib/hx509/collector.o \ - $(heimdalsrcdir)/lib/hx509/crypto.o \ - $(heimdalsrcdir)/lib/hx509/error.o \ - $(heimdalsrcdir)/lib/hx509/env.o \ - $(heimdalsrcdir)/lib/hx509/file.o \ - $(heimdalsrcdir)/lib/hx509/keyset.o \ - $(heimdalsrcdir)/lib/hx509/ks_dir.o \ - $(heimdalsrcdir)/lib/hx509/ks_file.o \ - $(heimdalsrcdir)/lib/hx509/ks_keychain.o \ - $(heimdalsrcdir)/lib/hx509/ks_mem.o \ - $(heimdalsrcdir)/lib/hx509/ks_null.o \ - $(heimdalsrcdir)/lib/hx509/ks_p11.o \ - $(heimdalsrcdir)/lib/hx509/ks_p12.o \ - $(heimdalsrcdir)/lib/hx509/lock.o \ - $(heimdalsrcdir)/lib/hx509/name.o \ - $(heimdalsrcdir)/lib/hx509/peer.o \ - $(heimdalsrcdir)/lib/hx509/print.o \ - $(heimdalsrcdir)/lib/hx509/req.o \ - $(heimdalsrcdir)/lib/hx509/revoke.o \ - $(heimdalsrcdir)/lib/hx509/hx509_err.o - -####################### -# Start SUBSYSTEM HEIMDAL_WIND -[SUBSYSTEM::HEIMDAL_WIND] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/wind -PRIVATE_DEPENDENCIES = \ - HEIMDAL_ROKEN HEIMDAL_COM_ERR - -HEIMDAL_WIND_OBJ_FILES = \ - $(heimdalsrcdir)/lib/wind/wind_err.o \ - $(heimdalsrcdir)/lib/wind/stringprep.o \ - $(heimdalsrcdir)/lib/wind/errorlist.o \ - $(heimdalsrcdir)/lib/wind/errorlist_table.o \ - $(heimdalsrcdir)/lib/wind/normalize.o \ - $(heimdalsrcdir)/lib/wind/normalize_table.o \ - $(heimdalsrcdir)/lib/wind/combining.o \ - $(heimdalsrcdir)/lib/wind/combining_table.o \ - $(heimdalsrcdir)/lib/wind/utf8.o \ - $(heimdalsrcdir)/lib/wind/bidi.o \ - $(heimdalsrcdir)/lib/wind/bidi_table.o \ - $(heimdalsrcdir)/lib/wind/ldap.o \ - $(heimdalsrcdir)/lib/wind/map.o \ - $(heimdalsrcdir)/lib/wind/map_table.o -# End SUBSYSTEM HEIMDAL_WIND -####################### - -[SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME] - -HEIMDAL_ROKEN_GETPROGNAME_OBJ_FILES = $(heimdalsrcdir)/lib/roken/getprogname.o -$(HEIMDAL_ROKEN_GETPROGNAME_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) - -[SUBSYSTEM::HEIMDAL_ROKEN_CLOSEFROM] - -HEIMDAL_ROKEN_CLOSEFROM_OBJ_FILES = $(heimdalsrcdir)/lib/roken/closefrom.o -$(HEIMDAL_ROKEN_CLOSEFROM_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) - -[SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME_H] - -HEIMDAL_ROKEN_GETPROGNAME_H_OBJ_FILES = $(heimdalsrcdir)/lib/roken/getprogname.ho -$(HEIMDAL_ROKEN_GETPROGNAME_H_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) - -####################### -# Start SUBSYSTEM HEIMDAL_ROKEN -[SUBSYSTEM::HEIMDAL_ROKEN] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) -PUBLIC_DEPENDENCIES = \ - HEIMDAL_ROKEN_GETPROGNAME \ - HEIMDAL_ROKEN_CLOSEFROM \ - RESOLV \ - LIBREPLACE_NETWORK -# End SUBSYSTEM HEIMDAL_ROKEN -####################### - -HEIMDAL_ROKEN_OBJ_FILES = \ - $(heimdalsrcdir)/lib/roken/base64.o \ - $(heimdalsrcdir)/lib/roken/hex.o \ - $(heimdalsrcdir)/lib/roken/bswap.o \ - $(heimdalsrcdir)/lib/roken/dumpdata.o \ - $(heimdalsrcdir)/lib/roken/emalloc.o \ - $(heimdalsrcdir)/lib/roken/ecalloc.o \ - $(heimdalsrcdir)/lib/roken/get_window_size.o \ - $(heimdalsrcdir)/lib/roken/h_errno.o \ - $(heimdalsrcdir)/lib/roken/issuid.o \ - $(heimdalsrcdir)/lib/roken/net_read.o \ - $(heimdalsrcdir)/lib/roken/net_write.o \ - $(heimdalsrcdir)/lib/roken/socket.o \ - $(heimdalsrcdir)/lib/roken/parse_time.o \ - $(heimdalsrcdir)/lib/roken/parse_units.o \ - $(heimdalsrcdir)/lib/roken/resolve.o \ - $(heimdalsrcdir)/lib/roken/roken_gethostby.o \ - $(heimdalsrcdir)/lib/roken/signal.o \ - $(heimdalsrcdir)/lib/roken/vis.o \ - $(heimdalsrcdir)/lib/roken/strlwr.o \ - $(heimdalsrcdir)/lib/roken/strsep_copy.o \ - $(heimdalsrcdir)/lib/roken/strsep.o \ - $(heimdalsrcdir)/lib/roken/strupr.o \ - $(heimdalsrcdir)/lib/roken/strpool.o \ - $(heimdalsrcdir)/lib/roken/estrdup.o \ - $(heimdalsrcdir)/lib/roken/erealloc.o \ - $(heimdalsrcdir)/lib/roken/simple_exec.o \ - $(heimdalsrcdir)/lib/roken/strcollect.o \ - $(heimdalsrcdir)/lib/roken/rtbl.o \ - $(heimdalbuildsrcdir)/replace.o - -####################### -# Start SUBSYSTEM HEIMDAL_GLUE -[SUBSYSTEM::HEIMDAL_GLUE] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err -PUBLIC_DEPENDENCIES = LIBNETIF LIBSAMBA-HOSTCONFIG -# End SUBSYSTEM HEIMDAL_GLUE -####################### - -HEIMDAL_GLUE_OBJ_FILES = $(heimdalbuildsrcdir)/glue.o - -####################### -# Start SUBSYSTEM HEIMDAL_COM_ERR -[SUBSYSTEM::HEIMDAL_COM_ERR] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err -PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN -# End SUBSYSTEM HEIMDAL_COM_ERR -####################### - -HEIMDAL_COM_ERR_OBJ_FILES = \ - $(heimdalsrcdir)/lib/com_err/com_err.o \ - $(heimdalsrcdir)/lib/com_err/error.o - -####################### -# Start SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX -[SUBSYSTEM::HEIMDAL_ASN1_COMPILE_LEX] -# End SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX -####################### - -HEIMDAL_ASN1_COMPILE_LEX_OBJ_FILES = $(heimdalsrcdir)/lib/asn1/lex.ho -$(HEIMDAL_ASN1_COMPILE_LEX_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) - -####################### -# Start BINARY asn1_compile -[BINARY::asn1_compile] -USE_HOSTCC = YES -PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK - -ASN1C = $(builddir)/bin/asn1_compile - -asn1_compile_OBJ_FILES = \ - $(heimdalsrcdir)/lib/asn1/main.ho \ - $(heimdalsrcdir)/lib/asn1/gen.ho \ - $(heimdalsrcdir)/lib/asn1/gen_copy.ho \ - $(heimdalsrcdir)/lib/asn1/gen_decode.ho \ - $(heimdalsrcdir)/lib/asn1/gen_encode.ho \ - $(heimdalsrcdir)/lib/asn1/gen_free.ho \ - $(heimdalsrcdir)/lib/asn1/gen_glue.ho \ - $(heimdalsrcdir)/lib/asn1/gen_length.ho \ - $(heimdalsrcdir)/lib/asn1/gen_seq.ho \ - $(heimdalsrcdir)/lib/asn1/hash.ho \ - $(heimdalsrcdir)/lib/asn1/parse.ho \ - $(heimdalsrcdir)/lib/roken/emalloc.ho \ - $(heimdalsrcdir)/lib/roken/getarg.ho \ - $(heimdalsrcdir)/lib/roken/setprogname.ho \ - $(heimdalsrcdir)/lib/roken/strupr.ho \ - $(heimdalsrcdir)/lib/roken/get_window_size.ho \ - $(heimdalsrcdir)/lib/roken/estrdup.ho \ - $(heimdalsrcdir)/lib/roken/ecalloc.ho \ - $(heimdalsrcdir)/lib/asn1/symbol.ho \ - $(heimdalsrcdir)/lib/vers/print_version.ho \ - $(socketwrappersrcdir)/socket_wrapper.ho \ - $(heimdalbuildsrcdir)/replace.ho - -$(asn1_compile_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(heimdalsrcdir)/lib/asn1 - -# End BINARY asn1_compile -####################### - -####################### -# Start SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX -[SUBSYSTEM::HEIMDAL_COM_ERR_COMPILE_LEX] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) -# End SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX -####################### - -HEIMDAL_COM_ERR_COMPILE_LEX_OBJ_FILES = $(heimdalsrcdir)/lib/com_err/lex.ho - -####################### -# Start BINARY compile_et -[BINARY::compile_et] -USE_HOSTCC = YES -PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK -# End BINARY compile_et -####################### - -ET_COMPILER = $(builddir)/bin/compile_et - -compile_et_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.ho \ - $(heimdalsrcdir)/lib/com_err/parse.ho \ - $(heimdalsrcdir)/lib/com_err/compile_et.ho \ - $(heimdalsrcdir)/lib/roken/getarg.ho \ - $(heimdalsrcdir)/lib/roken/get_window_size.ho \ - $(heimdalsrcdir)/lib/roken/strupr.ho \ - $(heimdalsrcdir)/lib/roken/setprogname.ho \ - $(socketwrappersrcdir)/socket_wrapper.ho \ - $(heimdalbuildsrcdir)/replace.ho - -$(compile_et_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken - -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hdb/hdb.asn1 hdb_asn1 \$\(heimdalsrcdir\)/lib/hdb | -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/gssapi/spnego/spnego.asn1 spnego_asn1 \$\(heimdalsrcdir\)/lib/gssapi --sequence=MechTypeList | -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/gssapi/mech/gssapi.asn1 gssapi_asn1 \$\(heimdalsrcdir\)/lib/gssapi| -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/k5.asn1 krb5_asn1 \$\(heimdalsrcdir\)/lib/asn1 --encode-rfc1510-bit-string --sequence=KRB5SignedPathPrincipals --sequence=AuthorizationData --sequence=METHOD-DATA| -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/digest.asn1 digest_asn1 \$\(heimdalsrcdir\)/lib/asn1| -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs8.asn1 pkcs8_asn1 \$\(heimdalsrcdir\)/lib/asn1| -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs9.asn1 pkcs9_asn1 \$\(heimdalsrcdir\)/lib/asn1| -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs12.asn1 pkcs12_asn1 \$\(heimdalsrcdir\)/lib/asn1| -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/rfc2459.asn1 rfc2459_asn1 \$\(heimdalsrcdir\)/lib/asn1 --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints| -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkinit.asn1 pkinit_asn1 \$\(heimdalsrcdir\)/lib/asn1| -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/CMS.asn1 cms_asn1 \$\(heimdalsrcdir\)/lib/asn1| -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hx509/ocsp.asn1 ocsp_asn1 \$\(heimdalsrcdir\)/lib/hx509 --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData| -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/kx509.asn1 kx509_asn1 \$\(heimdalsrcdir\)/lib/asn1| -mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hx509/pkcs10.asn1 pkcs10_asn1 \$\(heimdalsrcdir\)/lib/hx509 --preserve-binary=CertificationRequestInfo| - -# -# Ensure to update ./static_deps.mk when you add a new entry here! -# -mkinclude perl_path_wrapper.sh et_deps.pl lib/asn1/asn1_err.et \$\(heimdalsrcdir\)/lib/asn1| -mkinclude perl_path_wrapper.sh et_deps.pl lib/hdb/hdb_err.et \$\(heimdalsrcdir\)/lib/hdb| -mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/heim_err.et \$\(heimdalsrcdir\)/lib/krb5| -mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/k524_err.et \$\(heimdalsrcdir\)/lib/krb5| -mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/krb_err.et \$\(heimdalsrcdir\)/lib/krb5| -mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/krb5_err.et \$\(heimdalsrcdir\)/lib/krb5| -mkinclude perl_path_wrapper.sh et_deps.pl lib/gssapi/krb5/gkrb5_err.et \$\(heimdalsrcdir\)/lib/gssapi| -mkinclude perl_path_wrapper.sh et_deps.pl lib/hx509/hx509_err.et \$\(heimdalsrcdir\)/lib/hx509| -mkinclude perl_path_wrapper.sh et_deps.pl lib/wind/wind_err.et \$\(heimdalsrcdir\)/lib/wind| - -clean:: - @-rm -f bin/compile_et bin/asn1_compile - -####################### -# Start SUBSYSTEM HEIMDAL -[SUBSYSTEM::HEIMDAL] -CFLAGS = -I$(heimdalbuildsrcdir) -PUBLIC_DEPENDENCIES = \ - HEIMDAL_GSSAPI HEIMDAL_KRB5 -# End SUBSYSTEM HEIMDAL -####################### - -HEIMDAL_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.o - -####################### -# Start BINARY compile_et -[BINARY::samba4kinit] -PRIVATE_DEPENDENCIES = HEIMDAL_KRB5 HEIMDAL_NTLM -# End BINARY compile_et -####################### - -samba4kinit_OBJ_FILES = $(heimdalsrcdir)/kuser/kinit.o \ - $(heimdalsrcdir)/lib/vers/print_version.o \ - $(heimdalsrcdir)/lib/roken/setprogname.o \ - $(heimdalsrcdir)/lib/roken/getarg.o - -$(samba4kinit_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken - -dist:: $(heimdalsrcdir)/lib/asn1/lex.c $(heimdalsrcdir)/lib/com_err/lex.c \ - $(heimdalsrcdir)/lib/asn1/parse.c $(heimdalsrcdir)/lib/com_err/parse.c diff --git a/source4/heimdal_build/internal.m4 b/source4/heimdal_build/internal.m4 new file mode 100644 index 0000000000..18ecbb75cd --- /dev/null +++ b/source4/heimdal_build/internal.m4 @@ -0,0 +1,256 @@ +m4_define([upcase],`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`)dnl + +dnl love_FIND_FUNC(func, includes, arguments) +dnl kind of like AC_CHECK_FUNC, but with headerfiles +AC_DEFUN([love_FIND_FUNC], [ + +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(ac_cv_love_func_$1, +[ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2]],[[$1($3)]])], +[eval "ac_cv_love_func_$1=yes"],[eval "ac_cv_love_func_$1=no"])]) + +eval "ac_res=\$ac_cv_love_func_$1" + +if false; then + AC_CHECK_FUNCS($1) +fi +# $1 +eval "ac_tr_func=HAVE_[]upcase($1)" + +case "$ac_res" in + yes) + AC_DEFINE_UNQUOTED($ac_tr_func) + AC_MSG_RESULT([yes]) + ;; + no) + AC_MSG_RESULT([no]) + ;; +esac + + +]) + +dnl Not all systems have err.h, so we provide a replacement. Heimdal +dnl unconditionally #includes , so we need to create an err.h, +dnl but we can't just have a static one because we don't want to use +dnl it on systems that have a real err.h. If the system has a real +dnl err.h, we should use that (eg. on Darwin, the declarations get +dnl linker attributes added, so we can't guarantee that our local +dnl declarations will be correct). Phew! +AC_CHECK_HEADERS([err.h], [], + [ cp heimdal/lib/roken/err.hin heimdal_build/err.h ]) + +AC_CHECK_HEADERS([ \ + crypt.h \ + curses.h \ + errno.h \ + inttypes.h \ + netdb.h \ + signal.h \ + sys/bswap.h \ + sys/file.h \ + sys/stropts.h \ + sys/timeb.h \ + sys/times.h \ + sys/uio.h \ + sys/un.h \ + sys/utsname.h \ + term.h \ + termcap.h \ + time.h \ + timezone.h \ + ttyname.h \ + netinet/in.h \ + netinet/in6.h \ + netinet6/in6.h +]) + +AC_CHECK_FUNCS([ \ + atexit \ + cgetent \ + getprogname \ + inet_aton \ + gethostname \ + getnameinfo \ + iruserok \ + putenv \ + rcmd \ + readv \ + sendmsg \ + setitimer \ + socket \ + strlwr \ + strncasecmp \ + strptime \ + strsep \ + strsep_copy \ + strtok_r \ + strupr \ + swab \ + umask \ + uname \ + unsetenv \ + closefrom \ + hstrerror \ + err \ + warn \ + errx \ + warnx \ + flock \ + getipnodebyname \ + getipnodebyaddr \ + freehostent \ + writev +]) + +love_FIND_FUNC(bswap16, [#ifdef HAVE_SYS_BSWAP_H +#include +#endif], 0) + +love_FIND_FUNC(bswap32, [#ifdef HAVE_SYS_BSWAP_H +#include +#endif], 0) + +AC_DEFUN([AC_KRB_STRUCT_WINSIZE], [ +AC_MSG_CHECKING(for struct winsize) +AC_CACHE_VAL(ac_cv_struct_winsize, [ +ac_cv_struct_winsize=no +for i in sys/termios.h sys/ioctl.h; do +AC_EGREP_HEADER( +struct[[ ]]*winsize,dnl +$i, ac_cv_struct_winsize=yes; break)dnl +done +]) +if test "$ac_cv_struct_winsize" = "yes"; then + AC_DEFINE(HAVE_STRUCT_WINSIZE, 1, [define if struct winsize is declared in sys/termios.h]) +fi +AC_MSG_RESULT($ac_cv_struct_winsize) +AC_EGREP_HEADER(ws_xpixel, termios.h, + AC_DEFINE(HAVE_WS_XPIXEL, 1, [define if struct winsize has ws_xpixel])) +AC_EGREP_HEADER(ws_ypixel, termios.h, + AC_DEFINE(HAVE_WS_YPIXEL, 1, [define if struct winsize has ws_ypixel])) +]) + +AC_KRB_STRUCT_WINSIZE + +AC_TYPE_SIGNAL +if test "$ac_cv_type_signal" = "void" ; then + AC_DEFINE(VOID_RETSIGTYPE, 1, [Define if signal handlers return void.]) +fi +AC_SUBST(VOID_RETSIGTYPE) + + +m4_include(heimdal/cf/check-var.m4) + +rk_CHECK_VAR(h_errno, +[#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_NETDB_H +#include +#endif]) + +m4_include(heimdal/cf/find-func.m4) +m4_include(heimdal/cf/find-func-no-libs.m4) +m4_include(heimdal/cf/find-func-no-libs2.m4) +m4_include(heimdal/cf/resolv.m4) + +smb_save_LIBS=$LIBS +RESOLV_LIBS="" +LIBS="" + +dnl This fills in the global LIBS... +rk_RESOLV + +dnl AC_CHECK_LIB_EXT(resolv, RESOLV_LIBS, res_search) + SMB_ENABLE(RESOLV,YES) + +if test x"$LIBS" != "x"; then + RESOLV_LIBS=$LIBS +fi + +LIBS=$smb_save_LIBS + +SMB_EXT_LIB(RESOLV,[${RESOLV_LIBS}],[${RESOLV_CFLAGS}],[${RESOLV_CPPFLAGS}],[${RESOLV_LDFLAGS}]) + + +# these are disabled unless heimdal is found below +SMB_ENABLE(KERBEROS_LIB, NO) +SMB_ENABLE(asn1_compile, NO) +SMB_ENABLE(compile_et, NO) + +# +# We need bison -y and flex in new versions +# Otherwise we get random runtime failures +# +LEX_YACC_COMBINATIONS="" +LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.33:bison-2.3" + +AC_PROG_LEX +LEX_BASENAME=`basename "$LEX"` +if test x"$LEX_BASENAME" = x"flex"; then + # "flex 2.5.33" + FLEX_VERSION=`$LEX --version | cut -d ' ' -f2` + AC_MSG_CHECKING(flex version) + AC_MSG_RESULT($FLEX_VERSION) + FLEX_MAJOR=`echo $FLEX_VERSION | cut -d '.' -f1` + FLEX_MINOR=`echo $FLEX_VERSION | cut -d '.' -f2` + FLEX_RELEASE=`echo $FLEX_VERSION | cut -d '.' -f3` + + LEX_VERSION="flex-$FLEX_MAJOR.$FLEX_MINOR.$FLEX_RELEASE" +fi + +AC_PROG_YACC +YACC_BASENAME=`basename "$YACC"` +if test x"$YACC_BASENAME" = x"bison -y"; then + # bison (GNU Bison) 2.3 + BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4` + AC_MSG_CHECKING(bison version) + AC_MSG_RESULT($BISON_VERSION) + BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1` + BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2` + + YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR" +fi + +AC_MSG_CHECKING(working LEX YACC combination) +LEX_YACC="no" +if test x"$LEX_VERSION" != x"" -a x"$YACC_VERSION" != x""; then + V="$LEX_VERSION:$YACC_VERSION" + for C in $LEX_YACC_COMBINATIONS; do + if test x"$V" = x"$C"; then + LEX_YACC=$V + break; + fi + done +fi +if test x"$LEX_YACC" = x"no"; then + LEX=false + YACC=false +fi +AC_MSG_RESULT($LEX_YACC) + +# Portions of heimdal kerberos are unpacked into source/heimdal +# of the samba source tree. + +# if we ever get to using a host kerberos, we might add conditionals here +AC_DEFINE(HAVE_KRB5,1,[Whether kerberos is available]) +HAVE_KRB5=YES +SMB_ENABLE(KERBEROS_LIB, YES) +SMB_ENABLE(asn1_compile, YES) +SMB_ENABLE(compile_et, YES) + +# only add closefrom if needed +SMB_ENABLE(HEIMDAL_ROKEN_CLOSEFROM, NO) +if test t$ac_cv_func_closefrom != tyes; then + SMB_ENABLE(HEIMDAL_ROKEN_CLOSEFROM, YES) +fi + +# only add getprogname if needed +SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME, NO) +SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME_H, NO) +if test t$ac_cv_func_getprogname != tyes; then + SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME, YES) + SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME_H, YES) +fi diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk new file mode 100644 index 0000000000..17fc8c93ec --- /dev/null +++ b/source4/heimdal_build/internal.mk @@ -0,0 +1,624 @@ +heimdalbuildsrcdir = $(heimdalsrcdir)/../heimdal_build + +####################### +# Start SUBSYSTEM HEIMDAL_KDC +[SUBSYSTEM::HEIMDAL_KDC] +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/kdc +PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 HEIMDAL_HDB HEIMDAL_HEIM_ASN1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 +PUBLIC_DEPENDENCIES = HEIMDAL_NTLM HEIMDAL_HCRYPTO +# End SUBSYSTEM HEIMDAL_KDC +####################### + + +HEIMDAL_KDC_OBJ_FILES = \ + $(heimdalsrcdir)/kdc/default_config.o \ + $(heimdalsrcdir)/kdc/kerberos5.o \ + $(heimdalsrcdir)/kdc/krb5tgs.o \ + $(heimdalsrcdir)/kdc/pkinit.o \ + $(heimdalsrcdir)/kdc/log.o \ + $(heimdalsrcdir)/kdc/misc.o \ + $(heimdalsrcdir)/kdc/524.o \ + $(heimdalsrcdir)/kdc/kerberos4.o \ + $(heimdalsrcdir)/kdc/kaserver.o \ + $(heimdalsrcdir)/kdc/digest.o \ + $(heimdalsrcdir)/kdc/process.o \ + $(heimdalsrcdir)/kdc/windc.o \ + $(heimdalsrcdir)/kdc/kx509.o + +[SUBSYSTEM::HEIMDAL_NTLM] +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/ntlm +PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5 + +HEIMDAL_NTLM_OBJ_FILES = \ + $(heimdalsrcdir)/lib/ntlm/ntlm.o + +[SUBSYSTEM::HEIMDAL_HDB_KEYS] +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hdb +PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5 \ + HEIMDAL_HDB_ASN1 + +HEIMDAL_HDB_KEYS_OBJ_FILES = $(heimdalsrcdir)/lib/hdb/keys.o + +####################### +# Start SUBSYSTEM HEIMDAL_HDB +[SUBSYSTEM::HEIMDAL_HDB] +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hdb +PRIVATE_DEPENDENCIES = HDB_LDB HEIMDAL_KRB5 HEIMDAL_HDB_KEYS HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_COM_ERR HEIMDAL_HDB_ASN1 +# End SUBSYSTEM HEIMDAL_HDB +####################### + +HEIMDAL_HDB_OBJ_FILES = \ + $(heimdalsrcdir)/lib/hdb/db.o \ + $(heimdalsrcdir)/lib/hdb/dbinfo.o \ + $(heimdalsrcdir)/lib/hdb/hdb.o \ + $(heimdalsrcdir)/lib/hdb/ext.o \ + $(heimdalsrcdir)/lib/hdb/keytab.o \ + $(heimdalsrcdir)/lib/hdb/mkey.o \ + $(heimdalsrcdir)/lib/hdb/ndbm.o \ + $(heimdalsrcdir)/lib/hdb/hdb_err.o + +####################### +# Start SUBSYSTEM HEIMDAL_GSSAPI +[SUBSYSTEM::HEIMDAL_GSSAPI] +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/gssapi -I$(heimdalsrcdir)/lib/gssapi/gssapi -I$(heimdalsrcdir)/lib/gssapi/spnego -I$(heimdalsrcdir)/lib/gssapi/krb5 -I$(heimdalsrcdir)/lib/gssapi/mech +PRIVATE_DEPENDENCIES = HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1 +PUBLIC_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 +# End SUBSYSTEM HEIMDAL_GSSAPI +####################### + +HEIMDAL_GSSAPI_OBJ_FILES = \ + $(heimdalsrcdir)/lib/gssapi/mech/context.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_krb5.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_mech_switch.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_process_context_token.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_buffer_set.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_add_cred.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_add_oid_set_member.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_compare_name.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_release_oid_set.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_create_empty_oid_set.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_decapsulate_token.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_cred_by_oid.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_canonicalize_name.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_sec_context_by_oid.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_names_for_mech.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_mechs_for_name.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_wrap_size_limit.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_names.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_verify.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_display_name.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_duplicate_oid.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_display_status.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_release_buffer.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_release_oid.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_test_oid_set_member.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_release_cred.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_set_sec_context_option.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_export_name.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_seal.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_acquire_cred.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_unseal.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_verify_mic.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_accept_sec_context.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_cred_by_mech.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_indicate_mechs.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_delete_sec_context.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_sign.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_utils.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_init_sec_context.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_oid_equal.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_oid_to_str.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_context_time.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_encapsulate_token.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_get_mic.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_import_sec_context.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_cred.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_wrap.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_import_name.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_duplicate_name.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_unwrap.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_export_sec_context.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_inquire_context.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_release_name.o \ + $(heimdalsrcdir)/lib/gssapi/mech/gss_set_cred_option.o \ + $(heimdalsrcdir)/lib/gssapi/asn1_GSSAPIContextToken.o \ + $(heimdalsrcdir)/lib/gssapi/spnego/init_sec_context.o \ + $(heimdalsrcdir)/lib/gssapi/spnego/external.o \ + $(heimdalsrcdir)/lib/gssapi/spnego/compat.o \ + $(heimdalsrcdir)/lib/gssapi/spnego/context_stubs.o \ + $(heimdalsrcdir)/lib/gssapi/spnego/cred_stubs.o \ + $(heimdalsrcdir)/lib/gssapi/spnego/accept_sec_context.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/copy_ccache.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/delete_sec_context.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/init_sec_context.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/context_time.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/init.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/address_to_krb5addr.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/get_mic.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/inquire_context.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/add_cred.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/inquire_cred.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/inquire_cred_by_oid.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/inquire_cred_by_mech.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/inquire_mechs_for_name.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/inquire_names_for_mech.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/indicate_mechs.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/inquire_sec_context_by_oid.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/export_sec_context.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/import_sec_context.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/duplicate_name.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/import_name.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/compare_name.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/export_name.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/canonicalize_name.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/unwrap.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/wrap.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/release_name.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/cfx.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/8003.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/arcfour.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/encapsulate.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/display_name.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/sequence.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/display_status.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/release_buffer.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/external.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/compat.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/acquire_cred.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/release_cred.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/set_cred_option.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/decapsulate.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/verify_mic.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/accept_sec_context.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/set_sec_context_option.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/process_context_token.o \ + $(heimdalsrcdir)/lib/gssapi/krb5/prf.o + + +####################### +# Start SUBSYSTEM HEIMDAL_KRB5 +[SUBSYSTEM::HEIMDAL_KRB5] +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err +PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND +PUBLIC_DEPENDENCIES = HEIMDAL_KRB5_ASN1 HEIMDAL_GLUE HEIMDAL_HX509 HEIMDAL_HCRYPTO +# End SUBSYSTEM HEIMDAL_KRB5 +####################### + +HEIMDAL_KRB5_OBJ_FILES = \ + $(heimdalsrcdir)/lib/krb5/acache.o \ + $(heimdalsrcdir)/lib/krb5/add_et_list.o \ + $(heimdalsrcdir)/lib/krb5/addr_families.o \ + $(heimdalsrcdir)/lib/krb5/appdefault.o \ + $(heimdalsrcdir)/lib/krb5/asn1_glue.o \ + $(heimdalsrcdir)/lib/krb5/auth_context.o \ + $(heimdalsrcdir)/lib/krb5/build_ap_req.o \ + $(heimdalsrcdir)/lib/krb5/build_auth.o \ + $(heimdalsrcdir)/lib/krb5/cache.o \ + $(heimdalsrcdir)/lib/krb5/changepw.o \ + $(heimdalsrcdir)/lib/krb5/codec.o \ + $(heimdalsrcdir)/lib/krb5/config_file.o \ + $(heimdalsrcdir)/lib/krb5/config_file_netinfo.o \ + $(heimdalsrcdir)/lib/krb5/constants.o \ + $(heimdalsrcdir)/lib/krb5/context.o \ + $(heimdalsrcdir)/lib/krb5/convert_creds.o \ + $(heimdalsrcdir)/lib/krb5/copy_host_realm.o \ + $(heimdalsrcdir)/lib/krb5/crc.o \ + $(heimdalsrcdir)/lib/krb5/creds.o \ + $(heimdalsrcdir)/lib/krb5/crypto.o \ + $(heimdalsrcdir)/lib/krb5/data.o \ + $(heimdalsrcdir)/lib/krb5/eai_to_heim_errno.o \ + $(heimdalsrcdir)/lib/krb5/error_string.o \ + $(heimdalsrcdir)/lib/krb5/expand_hostname.o \ + $(heimdalsrcdir)/lib/krb5/fcache.o \ + $(heimdalsrcdir)/lib/krb5/free.o \ + $(heimdalsrcdir)/lib/krb5/free_host_realm.o \ + $(heimdalsrcdir)/lib/krb5/generate_seq_number.o \ + $(heimdalsrcdir)/lib/krb5/generate_subkey.o \ + $(heimdalsrcdir)/lib/krb5/get_cred.o \ + $(heimdalsrcdir)/lib/krb5/get_default_principal.o \ + $(heimdalsrcdir)/lib/krb5/get_default_realm.o \ + $(heimdalsrcdir)/lib/krb5/get_for_creds.o \ + $(heimdalsrcdir)/lib/krb5/get_host_realm.o \ + $(heimdalsrcdir)/lib/krb5/get_in_tkt.o \ + $(heimdalsrcdir)/lib/krb5/get_in_tkt_with_keytab.o \ + $(heimdalsrcdir)/lib/krb5/get_port.o \ + $(heimdalsrcdir)/lib/krb5/init_creds.o \ + $(heimdalsrcdir)/lib/krb5/init_creds_pw.o \ + $(heimdalsrcdir)/lib/krb5/kcm.o \ + $(heimdalsrcdir)/lib/krb5/keyblock.o \ + $(heimdalsrcdir)/lib/krb5/keytab.o \ + $(heimdalsrcdir)/lib/krb5/keytab_any.o \ + $(heimdalsrcdir)/lib/krb5/keytab_file.o \ + $(heimdalsrcdir)/lib/krb5/keytab_memory.o \ + $(heimdalsrcdir)/lib/krb5/keytab_keyfile.o \ + $(heimdalsrcdir)/lib/krb5/keytab_krb4.o \ + $(heimdalsrcdir)/lib/krb5/krbhst.o \ + $(heimdalsrcdir)/lib/krb5/log.o \ + $(heimdalsrcdir)/lib/krb5/mcache.o \ + $(heimdalsrcdir)/lib/krb5/misc.o \ + $(heimdalsrcdir)/lib/krb5/mk_error.o \ + $(heimdalsrcdir)/lib/krb5/mk_priv.o \ + $(heimdalsrcdir)/lib/krb5/mk_rep.o \ + $(heimdalsrcdir)/lib/krb5/mk_req.o \ + $(heimdalsrcdir)/lib/krb5/mk_req_ext.o \ + $(heimdalsrcdir)/lib/krb5/mit_glue.o \ + $(heimdalsrcdir)/lib/krb5/n-fold.o \ + $(heimdalsrcdir)/lib/krb5/padata.o \ + $(heimdalsrcdir)/lib/krb5/pkinit.o \ + $(heimdalsrcdir)/lib/krb5/plugin.o \ + $(heimdalsrcdir)/lib/krb5/principal.o \ + $(heimdalsrcdir)/lib/krb5/pac.o \ + $(heimdalsrcdir)/lib/krb5/prompter_posix.o \ + $(heimdalsrcdir)/lib/krb5/rd_cred.o \ + $(heimdalsrcdir)/lib/krb5/rd_error.o \ + $(heimdalsrcdir)/lib/krb5/rd_priv.o \ + $(heimdalsrcdir)/lib/krb5/rd_rep.o \ + $(heimdalsrcdir)/lib/krb5/rd_req.o \ + $(heimdalsrcdir)/lib/krb5/replay.o \ + $(heimdalsrcdir)/lib/krb5/send_to_kdc.o \ + $(heimdalsrcdir)/lib/krb5/set_default_realm.o \ + $(heimdalsrcdir)/lib/krb5/store.o \ + $(heimdalsrcdir)/lib/krb5/store_emem.o \ + $(heimdalsrcdir)/lib/krb5/store_fd.o \ + $(heimdalsrcdir)/lib/krb5/store_mem.o \ + $(heimdalsrcdir)/lib/krb5/ticket.o \ + $(heimdalsrcdir)/lib/krb5/time.o \ + $(heimdalsrcdir)/lib/krb5/transited.o \ + $(heimdalsrcdir)/lib/krb5/v4_glue.o \ + $(heimdalsrcdir)/lib/krb5/version.o \ + $(heimdalsrcdir)/lib/krb5/warn.o \ + $(heimdalsrcdir)/lib/krb5/krb5_err.o \ + $(heimdalsrcdir)/lib/krb5/heim_err.o \ + $(heimdalsrcdir)/lib/krb5/k524_err.o \ + $(heimdalsrcdir)/lib/krb5/krb_err.o + +####################### +# Start SUBSYSTEM HEIMDAL_HEIM_ASN1 +[SUBSYSTEM::HEIMDAL_HEIM_ASN1] +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 +PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_COM_ERR +# End SUBSYSTEM HEIMDAL_KRB5 +####################### + +HEIMDAL_HEIM_ASN1_OBJ_FILES = \ + $(heimdalsrcdir)/lib/asn1/der_get.o \ + $(heimdalsrcdir)/lib/asn1/der_put.o \ + $(heimdalsrcdir)/lib/asn1/der_free.o \ + $(heimdalsrcdir)/lib/asn1/der_format.o \ + $(heimdalsrcdir)/lib/asn1/der_length.o \ + $(heimdalsrcdir)/lib/asn1/der_copy.o \ + $(heimdalsrcdir)/lib/asn1/der_cmp.o \ + $(heimdalsrcdir)/lib/asn1/extra.o \ + $(heimdalsrcdir)/lib/asn1/timegm.o \ + $(heimdalsrcdir)/lib/asn1/asn1_err.o + +####################### +# Start SUBSYSTEM HEIMDAL_HCRYPTO_IMATH +[SUBSYSTEM::HEIMDAL_HCRYPTO_IMATH] +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hcrypto/imath +PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN +# End SUBSYSTEM HEIMDAL_HCRYPTO_IMATH +####################### + +HEIMDAL_HCRYPTO_IMATH_OBJ_FILES = \ + $(heimdalsrcdir)/lib/hcrypto/imath/imath.o \ + $(heimdalsrcdir)/lib/hcrypto/imath/iprime.o + +[SUBSYSTEM::HEIMDAL_HCRYPTO] +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hcrypto -I$(heimdalsrcdir)/lib +PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO_IMATH HEIMDAL_RFC2459_ASN1 +# End SUBSYSTEM HEIMDAL_HCRYPTO +####################### + +HEIMDAL_HCRYPTO_OBJ_FILES = \ + $(heimdalsrcdir)/lib/hcrypto/aes.o \ + $(heimdalsrcdir)/lib/hcrypto/bn.o \ + $(heimdalsrcdir)/lib/hcrypto/dh.o \ + $(heimdalsrcdir)/lib/hcrypto/dh-imath.o \ + $(heimdalsrcdir)/lib/hcrypto/des.o \ + $(heimdalsrcdir)/lib/hcrypto/dsa.o \ + $(heimdalsrcdir)/lib/hcrypto/engine.o \ + $(heimdalsrcdir)/lib/hcrypto/md2.o \ + $(heimdalsrcdir)/lib/hcrypto/md4.o \ + $(heimdalsrcdir)/lib/hcrypto/md5.o \ + $(heimdalsrcdir)/lib/hcrypto/rsa.o \ + $(heimdalsrcdir)/lib/hcrypto/rsa-imath.o \ + $(heimdalsrcdir)/lib/hcrypto/rc2.o \ + $(heimdalsrcdir)/lib/hcrypto/rc4.o \ + $(heimdalsrcdir)/lib/hcrypto/rijndael-alg-fst.o \ + $(heimdalsrcdir)/lib/hcrypto/rnd_keys.o \ + $(heimdalsrcdir)/lib/hcrypto/sha.o \ + $(heimdalsrcdir)/lib/hcrypto/sha256.o \ + $(heimdalsrcdir)/lib/hcrypto/ui.o \ + $(heimdalsrcdir)/lib/hcrypto/evp.o \ + $(heimdalsrcdir)/lib/hcrypto/pkcs5.o \ + $(heimdalsrcdir)/lib/hcrypto/pkcs12.o \ + $(heimdalsrcdir)/lib/hcrypto/rand.o \ + $(heimdalsrcdir)/lib/hcrypto/rand-egd.o \ + $(heimdalsrcdir)/lib/hcrypto/rand-unix.o \ + $(heimdalsrcdir)/lib/hcrypto/rand-fortuna.o \ + $(heimdalsrcdir)/lib/hcrypto/rand-timer.o \ + $(heimdalsrcdir)/lib/hcrypto/hmac.o \ + $(heimdalsrcdir)/lib/hcrypto/camellia.o \ + $(heimdalsrcdir)/lib/hcrypto/camellia-ntt.o + +####################### +# Start SUBSYSTEM HEIMDAL_HX509 +[SUBSYSTEM::HEIMDAL_HX509] +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/hx509 +PRIVATE_DEPENDENCIES = \ + HEIMDAL_ROKEN HEIMDAL_COM_ERR \ + HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO \ + HEIMDAL_CMS_ASN1 HEIMDAL_RFC2459_ASN1 \ + HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 \ + HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1 \ + HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1 \ + HEIMDAL_WIND +# End SUBSYSTEM HEIMDAL_HX509 +####################### + +HEIMDAL_HX509_OBJ_FILES = \ + $(heimdalsrcdir)/lib/hx509/ca.o \ + $(heimdalsrcdir)/lib/hx509/cert.o \ + $(heimdalsrcdir)/lib/hx509/cms.o \ + $(heimdalsrcdir)/lib/hx509/collector.o \ + $(heimdalsrcdir)/lib/hx509/crypto.o \ + $(heimdalsrcdir)/lib/hx509/error.o \ + $(heimdalsrcdir)/lib/hx509/env.o \ + $(heimdalsrcdir)/lib/hx509/file.o \ + $(heimdalsrcdir)/lib/hx509/keyset.o \ + $(heimdalsrcdir)/lib/hx509/ks_dir.o \ + $(heimdalsrcdir)/lib/hx509/ks_file.o \ + $(heimdalsrcdir)/lib/hx509/ks_keychain.o \ + $(heimdalsrcdir)/lib/hx509/ks_mem.o \ + $(heimdalsrcdir)/lib/hx509/ks_null.o \ + $(heimdalsrcdir)/lib/hx509/ks_p11.o \ + $(heimdalsrcdir)/lib/hx509/ks_p12.o \ + $(heimdalsrcdir)/lib/hx509/lock.o \ + $(heimdalsrcdir)/lib/hx509/name.o \ + $(heimdalsrcdir)/lib/hx509/peer.o \ + $(heimdalsrcdir)/lib/hx509/print.o \ + $(heimdalsrcdir)/lib/hx509/req.o \ + $(heimdalsrcdir)/lib/hx509/revoke.o \ + $(heimdalsrcdir)/lib/hx509/hx509_err.o + +####################### +# Start SUBSYSTEM HEIMDAL_WIND +[SUBSYSTEM::HEIMDAL_WIND] +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/wind +PRIVATE_DEPENDENCIES = \ + HEIMDAL_ROKEN HEIMDAL_COM_ERR + +HEIMDAL_WIND_OBJ_FILES = \ + $(heimdalsrcdir)/lib/wind/wind_err.o \ + $(heimdalsrcdir)/lib/wind/stringprep.o \ + $(heimdalsrcdir)/lib/wind/errorlist.o \ + $(heimdalsrcdir)/lib/wind/errorlist_table.o \ + $(heimdalsrcdir)/lib/wind/normalize.o \ + $(heimdalsrcdir)/lib/wind/normalize_table.o \ + $(heimdalsrcdir)/lib/wind/combining.o \ + $(heimdalsrcdir)/lib/wind/combining_table.o \ + $(heimdalsrcdir)/lib/wind/utf8.o \ + $(heimdalsrcdir)/lib/wind/bidi.o \ + $(heimdalsrcdir)/lib/wind/bidi_table.o \ + $(heimdalsrcdir)/lib/wind/ldap.o \ + $(heimdalsrcdir)/lib/wind/map.o \ + $(heimdalsrcdir)/lib/wind/map_table.o +# End SUBSYSTEM HEIMDAL_WIND +####################### + +[SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME] + +HEIMDAL_ROKEN_GETPROGNAME_OBJ_FILES = $(heimdalsrcdir)/lib/roken/getprogname.o +$(HEIMDAL_ROKEN_GETPROGNAME_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) + +[SUBSYSTEM::HEIMDAL_ROKEN_CLOSEFROM] + +HEIMDAL_ROKEN_CLOSEFROM_OBJ_FILES = $(heimdalsrcdir)/lib/roken/closefrom.o +$(HEIMDAL_ROKEN_CLOSEFROM_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) + +[SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME_H] + +HEIMDAL_ROKEN_GETPROGNAME_H_OBJ_FILES = $(heimdalsrcdir)/lib/roken/getprogname.ho +$(HEIMDAL_ROKEN_GETPROGNAME_H_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) + +####################### +# Start SUBSYSTEM HEIMDAL_ROKEN +[SUBSYSTEM::HEIMDAL_ROKEN] +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) +PUBLIC_DEPENDENCIES = \ + HEIMDAL_ROKEN_GETPROGNAME \ + HEIMDAL_ROKEN_CLOSEFROM \ + RESOLV \ + LIBREPLACE_NETWORK +# End SUBSYSTEM HEIMDAL_ROKEN +####################### + +HEIMDAL_ROKEN_OBJ_FILES = \ + $(heimdalsrcdir)/lib/roken/base64.o \ + $(heimdalsrcdir)/lib/roken/hex.o \ + $(heimdalsrcdir)/lib/roken/bswap.o \ + $(heimdalsrcdir)/lib/roken/dumpdata.o \ + $(heimdalsrcdir)/lib/roken/emalloc.o \ + $(heimdalsrcdir)/lib/roken/ecalloc.o \ + $(heimdalsrcdir)/lib/roken/get_window_size.o \ + $(heimdalsrcdir)/lib/roken/h_errno.o \ + $(heimdalsrcdir)/lib/roken/issuid.o \ + $(heimdalsrcdir)/lib/roken/net_read.o \ + $(heimdalsrcdir)/lib/roken/net_write.o \ + $(heimdalsrcdir)/lib/roken/socket.o \ + $(heimdalsrcdir)/lib/roken/parse_time.o \ + $(heimdalsrcdir)/lib/roken/parse_units.o \ + $(heimdalsrcdir)/lib/roken/resolve.o \ + $(heimdalsrcdir)/lib/roken/roken_gethostby.o \ + $(heimdalsrcdir)/lib/roken/signal.o \ + $(heimdalsrcdir)/lib/roken/vis.o \ + $(heimdalsrcdir)/lib/roken/strlwr.o \ + $(heimdalsrcdir)/lib/roken/strsep_copy.o \ + $(heimdalsrcdir)/lib/roken/strsep.o \ + $(heimdalsrcdir)/lib/roken/strupr.o \ + $(heimdalsrcdir)/lib/roken/strpool.o \ + $(heimdalsrcdir)/lib/roken/estrdup.o \ + $(heimdalsrcdir)/lib/roken/erealloc.o \ + $(heimdalsrcdir)/lib/roken/simple_exec.o \ + $(heimdalsrcdir)/lib/roken/strcollect.o \ + $(heimdalsrcdir)/lib/roken/rtbl.o \ + $(heimdalbuildsrcdir)/replace.o + +####################### +# Start SUBSYSTEM HEIMDAL_GLUE +[SUBSYSTEM::HEIMDAL_GLUE] +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err +PUBLIC_DEPENDENCIES = LIBNETIF LIBSAMBA-HOSTCONFIG +# End SUBSYSTEM HEIMDAL_GLUE +####################### + +HEIMDAL_GLUE_OBJ_FILES = $(heimdalbuildsrcdir)/glue.o + +####################### +# Start SUBSYSTEM HEIMDAL_COM_ERR +[SUBSYSTEM::HEIMDAL_COM_ERR] +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err +PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN +# End SUBSYSTEM HEIMDAL_COM_ERR +####################### + +HEIMDAL_COM_ERR_OBJ_FILES = \ + $(heimdalsrcdir)/lib/com_err/com_err.o \ + $(heimdalsrcdir)/lib/com_err/error.o + +####################### +# Start SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX +[SUBSYSTEM::HEIMDAL_ASN1_COMPILE_LEX] +# End SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX +####################### + +HEIMDAL_ASN1_COMPILE_LEX_OBJ_FILES = $(heimdalsrcdir)/lib/asn1/lex.ho +$(HEIMDAL_ASN1_COMPILE_LEX_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) + +####################### +# Start BINARY asn1_compile +[BINARY::asn1_compile] +USE_HOSTCC = YES +PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK + +ASN1C = $(builddir)/bin/asn1_compile + +asn1_compile_OBJ_FILES = \ + $(heimdalsrcdir)/lib/asn1/main.ho \ + $(heimdalsrcdir)/lib/asn1/gen.ho \ + $(heimdalsrcdir)/lib/asn1/gen_copy.ho \ + $(heimdalsrcdir)/lib/asn1/gen_decode.ho \ + $(heimdalsrcdir)/lib/asn1/gen_encode.ho \ + $(heimdalsrcdir)/lib/asn1/gen_free.ho \ + $(heimdalsrcdir)/lib/asn1/gen_glue.ho \ + $(heimdalsrcdir)/lib/asn1/gen_length.ho \ + $(heimdalsrcdir)/lib/asn1/gen_seq.ho \ + $(heimdalsrcdir)/lib/asn1/hash.ho \ + $(heimdalsrcdir)/lib/asn1/parse.ho \ + $(heimdalsrcdir)/lib/roken/emalloc.ho \ + $(heimdalsrcdir)/lib/roken/getarg.ho \ + $(heimdalsrcdir)/lib/roken/setprogname.ho \ + $(heimdalsrcdir)/lib/roken/strupr.ho \ + $(heimdalsrcdir)/lib/roken/get_window_size.ho \ + $(heimdalsrcdir)/lib/roken/estrdup.ho \ + $(heimdalsrcdir)/lib/roken/ecalloc.ho \ + $(heimdalsrcdir)/lib/asn1/symbol.ho \ + $(heimdalsrcdir)/lib/vers/print_version.ho \ + $(socketwrappersrcdir)/socket_wrapper.ho \ + $(heimdalbuildsrcdir)/replace.ho + +$(asn1_compile_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(heimdalsrcdir)/lib/asn1 + +# End BINARY asn1_compile +####################### + +####################### +# Start SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX +[SUBSYSTEM::HEIMDAL_COM_ERR_COMPILE_LEX] +CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/com_err -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) +# End SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX +####################### + +HEIMDAL_COM_ERR_COMPILE_LEX_OBJ_FILES = $(heimdalsrcdir)/lib/com_err/lex.ho + +####################### +# Start BINARY compile_et +[BINARY::compile_et] +USE_HOSTCC = YES +PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK +# End BINARY compile_et +####################### + +ET_COMPILER = $(builddir)/bin/compile_et + +compile_et_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.ho \ + $(heimdalsrcdir)/lib/com_err/parse.ho \ + $(heimdalsrcdir)/lib/com_err/compile_et.ho \ + $(heimdalsrcdir)/lib/roken/getarg.ho \ + $(heimdalsrcdir)/lib/roken/get_window_size.ho \ + $(heimdalsrcdir)/lib/roken/strupr.ho \ + $(heimdalsrcdir)/lib/roken/setprogname.ho \ + $(socketwrappersrcdir)/socket_wrapper.ho \ + $(heimdalbuildsrcdir)/replace.ho + +$(compile_et_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken + +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hdb/hdb.asn1 hdb_asn1 \$\(heimdalsrcdir\)/lib/hdb | +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/gssapi/spnego/spnego.asn1 spnego_asn1 \$\(heimdalsrcdir\)/lib/gssapi --sequence=MechTypeList | +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/gssapi/mech/gssapi.asn1 gssapi_asn1 \$\(heimdalsrcdir\)/lib/gssapi| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/k5.asn1 krb5_asn1 \$\(heimdalsrcdir\)/lib/asn1 --encode-rfc1510-bit-string --sequence=KRB5SignedPathPrincipals --sequence=AuthorizationData --sequence=METHOD-DATA| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/digest.asn1 digest_asn1 \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs8.asn1 pkcs8_asn1 \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs9.asn1 pkcs9_asn1 \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkcs12.asn1 pkcs12_asn1 \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/rfc2459.asn1 rfc2459_asn1 \$\(heimdalsrcdir\)/lib/asn1 --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/pkinit.asn1 pkinit_asn1 \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/CMS.asn1 cms_asn1 \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hx509/ocsp.asn1 ocsp_asn1 \$\(heimdalsrcdir\)/lib/hx509 --preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/kx509.asn1 kx509_asn1 \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hx509/pkcs10.asn1 pkcs10_asn1 \$\(heimdalsrcdir\)/lib/hx509 --preserve-binary=CertificationRequestInfo| + +# +# Ensure to update ./static_deps.mk when you add a new entry here! +# +mkinclude perl_path_wrapper.sh et_deps.pl lib/asn1/asn1_err.et \$\(heimdalsrcdir\)/lib/asn1| +mkinclude perl_path_wrapper.sh et_deps.pl lib/hdb/hdb_err.et \$\(heimdalsrcdir\)/lib/hdb| +mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/heim_err.et \$\(heimdalsrcdir\)/lib/krb5| +mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/k524_err.et \$\(heimdalsrcdir\)/lib/krb5| +mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/krb_err.et \$\(heimdalsrcdir\)/lib/krb5| +mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/krb5_err.et \$\(heimdalsrcdir\)/lib/krb5| +mkinclude perl_path_wrapper.sh et_deps.pl lib/gssapi/krb5/gkrb5_err.et \$\(heimdalsrcdir\)/lib/gssapi| +mkinclude perl_path_wrapper.sh et_deps.pl lib/hx509/hx509_err.et \$\(heimdalsrcdir\)/lib/hx509| +mkinclude perl_path_wrapper.sh et_deps.pl lib/wind/wind_err.et \$\(heimdalsrcdir\)/lib/wind| + +clean:: + @-rm -f bin/compile_et bin/asn1_compile + +####################### +# Start SUBSYSTEM HEIMDAL +[SUBSYSTEM::HEIMDAL] +CFLAGS = -I$(heimdalbuildsrcdir) +PUBLIC_DEPENDENCIES = \ + HEIMDAL_GSSAPI HEIMDAL_KRB5 +# End SUBSYSTEM HEIMDAL +####################### + +HEIMDAL_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.o + +####################### +# Start BINARY compile_et +[BINARY::samba4kinit] +PRIVATE_DEPENDENCIES = HEIMDAL_KRB5 HEIMDAL_NTLM +# End BINARY compile_et +####################### + +samba4kinit_OBJ_FILES = $(heimdalsrcdir)/kuser/kinit.o \ + $(heimdalsrcdir)/lib/vers/print_version.o \ + $(heimdalsrcdir)/lib/roken/setprogname.o \ + $(heimdalsrcdir)/lib/roken/getarg.o + +$(samba4kinit_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken + +dist:: $(heimdalsrcdir)/lib/asn1/lex.c $(heimdalsrcdir)/lib/com_err/lex.c \ + $(heimdalsrcdir)/lib/asn1/parse.c $(heimdalsrcdir)/lib/com_err/parse.c diff --git a/source4/main.mk b/source4/main.mk index 3f3aea87e6..f0ce9685f9 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -1,5 +1,5 @@ mkinclude dynconfig/config.mk -mkinclude heimdal_build/config.mk +mkinclude heimdal_build/internal.mk mkinclude config.mk mkinclude dsdb/config.mk mkinclude smbd/config.mk -- cgit From 7974ccbebf5c684200850a726d79b976eaeea261 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 10 Jun 2008 12:54:45 +1000 Subject: Tone down the warnings in the WHATSNEW. Also fix some things up for the next release. Andrew Bartlett (This used to be commit 4ae5c1a8bd43aa04ce54d72a318c7f445e0e5027) --- WHATSNEW.txt | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/WHATSNEW.txt b/WHATSNEW.txt index e4c4ea8087..8f17e981fe 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -6,12 +6,8 @@ developed in parallel to the stable 3.0 series. The main emphasis in this branch is support for the Active Directory logon protocols used by Windows 2000 and above. -Samba 4 is currently not yet in a state where it is usable in -production environments. Note the WARNINGS below, and the STATUS file, -which aims to document what should and should not work. - Samba4 alpha4 follows on from the alpha release series we have been -publishing since September last year. +publishing since September 2007 WARNINGS ======== @@ -24,14 +20,17 @@ Samba4, you would find many things work, but that other key features you may have relied on simply are not there yet. For example, while Samba 3.0 is an excellent member of a Active -Directory domain, Samba4 is happier as a domain controller: (This is -where we have done most of the research and development). - -While Samba4 is subjected to an awesome battery of tests on an -automated basis, and we have found Samba4 to be very stable in it's -behaviour, we have to recommend against upgrading production servers -from Samba 3 to Samba 4 at this stage. If you are upgrading an -experimental server, or looking to develop and test Samba, you should +Directory domain, Samba4 is happier as a domain controller, and it is +in this role where it has seen deployment into production. + +Samba4 is subjected to an awesome battery of tests on an +automated basis, we have found Samba4 to be very stable in it's +behaviour. We have to recommend against upgrading production servers +from Samba 3 to Samba 4 at this stage, because there may be the features on +which you may rely that are not present, or the mapping of +your configuration and user database may not be complete. + +If you are upgrading, or looking to develop, test or deploy Samba4, you should backup all configuration and data. NEW FEATURES @@ -63,12 +62,14 @@ working on modules to map between AD-like behaviours and this backend. We are aiming for Samba 4 to be powerful frontend to large directories. -CHANGES SINCE Alpha3 +CHANGES SINCE Alpha4 ===================== -In the time since Samba4 Alpha2 was released in December 2007, Samba has +In the time since Samba4 Alpha4 was released in June 2008, Samba has continued to evolve, but you may particularly notice these areas: +(TODO: update list when closer to a release) + Python Bindings: Bindings for Python are now used for all internal scripting, and the system python installation is used to run all Samba python scripts (in place of smbpython found in the previous @@ -136,9 +137,9 @@ KNOWN ISSUES expected during the next alpha cycle - Samba4 alpha4 is incompatible with GnuTLS 2.0, found in Fedora 9 and - recent Ubuntu releases. Please remove the - gnutls-devel/libgnutls-dev package before compiling (otherwise 'make - test' and LDAPS operations will hang). + recent Ubuntu releases. GnuTLS use may be disabled using the + --disable-gnutls argument to ./configure. (otherwise 'make test' and + LDAPS operations will hang). RUNNING Samba4 ============== -- cgit From 47b106c0ae8b91c9cccfc21bf8e4e416b1abfd5d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 10 Jun 2008 08:33:24 +0200 Subject: socket_wrapper: truncate packets to a 1500 byte payload Truncate sendto(), recvfrom(), send() and recv() to 1500 bytes so that're getting a correctly formatted pcap file and the result look more like real network traffic. metze (This used to be commit 5b01206f1bb2e62c08bda34b45904ec4f83ac5de) --- source4/lib/socket_wrapper/socket_wrapper.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source4/lib/socket_wrapper/socket_wrapper.c b/source4/lib/socket_wrapper/socket_wrapper.c index 86d9f7a312..981df523cd 100644 --- a/source4/lib/socket_wrapper/socket_wrapper.c +++ b/source4/lib/socket_wrapper/socket_wrapper.c @@ -1643,6 +1643,8 @@ _PUBLIC_ ssize_t swrap_recvfrom(int s, void *buf, size_t len, int flags, struct return real_recvfrom(s, buf, len, flags, from, fromlen); } + len = MIN(len, 1500); + /* irix 6.4 forgets to null terminate the sun_path string :-( */ memset(&un_addr, 0, sizeof(un_addr)); ret = real_recvfrom(s, buf, len, flags, (struct sockaddr *)&un_addr, &un_addrlen); @@ -1671,6 +1673,8 @@ _PUBLIC_ ssize_t swrap_sendto(int s, const void *buf, size_t len, int flags, con return real_sendto(s, buf, len, flags, to, tolen); } + len = MIN(len, 1500); + switch (si->type) { case SOCK_STREAM: ret = real_send(s, buf, len, flags); @@ -1764,6 +1768,8 @@ _PUBLIC_ ssize_t swrap_recv(int s, void *buf, size_t len, int flags) return real_recv(s, buf, len, flags); } + len = MIN(len, 1500); + ret = real_recv(s, buf, len, flags); if (ret == -1 && errno != EAGAIN && errno != ENOBUFS) { swrap_dump_packet(si, NULL, SWRAP_RECV_RST, NULL, 0); @@ -1786,6 +1792,8 @@ _PUBLIC_ ssize_t swrap_send(int s, const void *buf, size_t len, int flags) return real_send(s, buf, len, flags); } + len = MIN(len, 1500); + ret = real_send(s, buf, len, flags); if (ret == -1) { -- cgit From c8100b48d1a747b589779a129324e49590167ae8 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 10 Jun 2008 09:13:08 +0200 Subject: Some C++ warnings (partialy cherry picked from commit 5ab82d4f574f2a2e2761e9e414c66a70aeffb05d) metze (This used to be commit 4933cd49ac81454cbd4b0fc33d888585a9437b9d) --- source4/lib/socket_wrapper/socket_wrapper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source4/lib/socket_wrapper/socket_wrapper.c b/source4/lib/socket_wrapper/socket_wrapper.c index 981df523cd..22186872d6 100644 --- a/source4/lib/socket_wrapper/socket_wrapper.c +++ b/source4/lib/socket_wrapper/socket_wrapper.c @@ -697,8 +697,8 @@ static const char *socket_wrapper_pcap_file(void) { static int initialized = 0; static const char *s = NULL; - static const struct swrap_file_hdr h; - static const struct swrap_packet p; + static const struct swrap_file_hdr h = { 0, }; + static const struct swrap_packet p = { 0, }; if (initialized == 1) { return s; -- cgit From 85087ce095499dbadc5e9e394c22b08e6206a6f2 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 21 Dec 2007 12:11:23 -0800 Subject: Fix initialization warnings. Jeremy. (cherry picked from commit 832c093830cb3978641be3d87670fa900105da25) (This used to be commit 3a4198b1181d6b97804afebbb91dac5a8242f615) --- source4/lib/socket_wrapper/socket_wrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source4/lib/socket_wrapper/socket_wrapper.c b/source4/lib/socket_wrapper/socket_wrapper.c index 22186872d6..336179d837 100644 --- a/source4/lib/socket_wrapper/socket_wrapper.c +++ b/source4/lib/socket_wrapper/socket_wrapper.c @@ -698,7 +698,7 @@ static const char *socket_wrapper_pcap_file(void) static int initialized = 0; static const char *s = NULL; static const struct swrap_file_hdr h = { 0, }; - static const struct swrap_packet p = { 0, }; + static const struct swrap_packet p = { { 0, }, { { 0, }, { { 0, } } } }; if (initialized == 1) { return s; -- cgit From 7206c5fc4a0fc9d310fef199c6ff9d0300bc956b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 10 Jun 2008 09:52:04 +0200 Subject: Revert "Add configure test for vdeplug library." This reverts commit 89590d7dfe0735093a4a5b66eeed9276df043ac9. We don't need this yet and currently config.m4 is also used by samba3 which bail out with the check in it, as it doesn't know about the SMB_EXT_LIB() macro metze (This used to be commit bd0ec1754e6e187d421a718410ecd7c21922aa8b) --- source4/build/smb_build/summary.pm | 3 --- source4/lib/socket_wrapper/config.m4 | 7 ------- 2 files changed, 10 deletions(-) diff --git a/source4/build/smb_build/summary.pm b/source4/build/smb_build/summary.pm index a6557fb1fe..4ea1ad525e 100644 --- a/source4/build/smb_build/summary.pm +++ b/source4/build/smb_build/summary.pm @@ -53,9 +53,6 @@ sub show($$) showitem($output, "using libblkid", ["BLKID"]); showitem($output, "using iconv", ["ICONV"]); showitem($output, "using pam", ["PAM"]); - if (enabled($config->{developer})) { - showitem($output, "using VDE", ["VDEPLUG"]); - } showitem($output, "python bindings", ["LIBPYTHON"]); showisexternal($output, "popt", "LIBPOPT"); showisexternal($output, "talloc", "LIBTALLOC"); diff --git a/source4/lib/socket_wrapper/config.m4 b/source4/lib/socket_wrapper/config.m4 index 8ff91075bb..f3ffb895a9 100644 --- a/source4/lib/socket_wrapper/config.m4 +++ b/source4/lib/socket_wrapper/config.m4 @@ -20,10 +20,3 @@ fi AC_SUBST(DEFAULT_TEST_OPTIONS) AC_SUBST(HAVE_SOCKET_WRAPPER) AC_SUBST(SOCKET_WRAPPER_OBJS) - -# Look for the vdeplug library -AC_CHECK_HEADERS(libvdeplug.h) -if test x"$ac_cv_header_libvdeplug_h" = xyes; then - AC_DEFINE(HAVE_VDEPLUG, 1, [Whether the VDE plug library is available]) - SMB_EXT_LIB(VDEPLUG,[-lvdeplug],[],[],[]) -fi -- cgit