From 3deece559159150a0710d8160f39583ba7f2e582 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 31 Oct 2010 02:17:29 +0100 Subject: s4: Remove the old perl/m4/make/mk-based build system. The new waf-based build system now has all the same functionality, and the old build system has been broken for quite some time. Autobuild-User: Jelmer Vernooij Autobuild-Date: Sun Oct 31 02:01:44 UTC 2010 on sn-devel-104 --- source4/auth/config.m4 | 32 --- source4/auth/config.mk | 51 ---- source4/auth/credentials/config.mk | 20 -- source4/auth/gensec/config.m4 | 2 - source4/auth/gensec/config.mk | 82 ------ source4/auth/kerberos/config.m4 | 542 ------------------------------------- source4/auth/kerberos/config.mk | 19 -- source4/auth/ntlm/config.mk | 80 ------ source4/auth/ntlmssp/config.mk | 13 - 9 files changed, 841 deletions(-) delete mode 100644 source4/auth/config.m4 delete mode 100644 source4/auth/config.mk delete mode 100644 source4/auth/credentials/config.mk delete mode 100644 source4/auth/gensec/config.m4 delete mode 100644 source4/auth/gensec/config.mk delete mode 100644 source4/auth/kerberos/config.m4 delete mode 100644 source4/auth/kerberos/config.mk delete mode 100644 source4/auth/ntlm/config.mk delete mode 100644 source4/auth/ntlmssp/config.mk (limited to 'source4/auth') diff --git a/source4/auth/config.m4 b/source4/auth/config.m4 deleted file mode 100644 index 03fdadb4e2..0000000000 --- a/source4/auth/config.m4 +++ /dev/null @@ -1,32 +0,0 @@ -############################### -# start SMB_EXT_LIB_PAM -# check for security/pam_appl.h and -lpam -# Tests are now moved in ../nsswitch/config.m4 because winbind stuff require more pam tests -# end SMB_EXT_LIB_PAM -############################### - -################################################ -# test for where we get crypt() from -AC_CHECK_LIB_EXT(crypt, CRYPT_LIBS, crypt) -SMB_ENABLE(CRYPT,YES) -SMB_EXT_LIB(CRYPT, $CRYPT_LIBS) - -AC_CHECK_FUNCS(crypt16 getauthuid getpwanam) - -AC_CHECK_HEADERS(sasl/sasl.h) -AC_CHECK_LIB_EXT(sasl2, SASL_LIBS, sasl_client_init) - -if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_client_init" = x"yes";then - SMB_ENABLE(SASL,YES) - SMB_ENABLE(cyrus_sasl,YES) - SASL_CFLAGS="$CFLAGS" - SASL_CPPFLAGS="$CPPFLAGS" - SASL_LDFLAGS="$LDFLAGS" - LIB_REMOVE_USR_LIB(SASL_LDFLAGS) - CFLAGS_REMOVE_USR_INCLUDE(SASL_CPPFLAGS) - CFLAGS_REMOVE_USR_INCLUDE(SASL_CFLAGS) -else - SMB_ENABLE(cyrus_sasl,NO) -fi - -SMB_EXT_LIB(SASL, $SASL_LIBS, [${SASL_CFLAGS}], [${SASL_CPPFLAGS}], [${SASL_LDFLAGS}]) diff --git a/source4/auth/config.mk b/source4/auth/config.mk deleted file mode 100644 index 573f1972bc..0000000000 --- a/source4/auth/config.mk +++ /dev/null @@ -1,51 +0,0 @@ -# auth server subsystem -gensecsrcdir := $(authsrcdir)/gensec -mkinclude gensec/config.mk -mkinclude kerberos/config.mk -mkinclude ntlmssp/config.mk -mkinclude ntlm/config.mk -mkinclude credentials/config.mk - -[SUBSYSTEM::auth_session] -PUBLIC_DEPENDENCIES = CREDENTIALS -PRIVATE_DEPENDENCIES = SAMDB - -PUBLIC_HEADERS += $(authsrcdir)/session.h - -auth_session_OBJ_FILES = $(addprefix $(authsrcdir)/, session.o) - -$(eval $(call proto_header_template,$(authsrcdir)/session_proto.h,$(auth_session_OBJ_FILES:.o=.c))) - -[SUBSYSTEM::samba_server_gensec] -PUBLIC_DEPENDENCIES = CREDENTIALS GENSEC auth - -samba_server_gensec_OBJ_FILES = $(addprefix $(authsrcdir)/, samba_server_gensec.o) - -[SUBSYSTEM::auth_system_session] -PUBLIC_DEPENDENCIES = CREDENTIALS -PRIVATE_DEPENDENCIES = auth_session LIBSAMBA-UTIL LIBSECURITY - -auth_system_session_OBJ_FILES = $(addprefix $(authsrcdir)/, system_session.o) -$(eval $(call proto_header_template,$(authsrcdir)/system_session_proto.h,$(auth_system_session_OBJ_FILES:.o=.c))) - -[SUBSYSTEM::auth_sam] -PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY -PRIVATE_DEPENDENCIES = LDAP_ENCODE - -auth_sam_OBJ_FILES = $(addprefix $(authsrcdir)/, sam.o) - -$(eval $(call proto_header_template,$(authsrcdir)/auth_sam.h,$(auth_sam_OBJ_FILES:.o=.c))) - -[SUBSYSTEM::auth_sam_reply] - -auth_sam_reply_OBJ_FILES = $(addprefix $(authsrcdir)/, auth_sam_reply.o) - -$(eval $(call proto_header_template,$(authsrcdir)/auth_sam_reply.h,$(auth_sam_reply_OBJ_FILES:.o=.c))) - -[PYTHON::pyauth] -LIBRARY_REALNAME = samba/auth.$(SHLIBEXT) -PUBLIC_DEPENDENCIES = auth_system_session -PRIVATE_DEPENDENCIES = SAMDB PYTALLOC pyparam_util - -pyauth_OBJ_FILES = $(authsrcdir)/pyauth.o - diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk deleted file mode 100644 index 2d3518017d..0000000000 --- a/source4/auth/credentials/config.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################# -# Start SUBSYSTEM CREDENTIALS -[SUBSYSTEM::CREDENTIALS] -PUBLIC_DEPENDENCIES = \ - LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS HEIMDAL_GSSAPI -PRIVATE_DEPENDENCIES = \ - SECRETS SAMDB - - -CREDENTIALS_OBJ_FILES = $(addprefix $(authsrcdir)/credentials/, credentials.o credentials_files.o credentials_ntlm.o credentials_krb5.o ../kerberos/kerberos_util.o) - -$(eval $(call proto_header_template,$(authsrcdir)/credentials/credentials_proto.h,$(CREDENTIALS_OBJ_FILES:.o=.c))) - -PUBLIC_HEADERS += $(authsrcdir)/credentials/credentials.h - -[PYTHON::pycredentials] -LIBRARY_REALNAME = samba/credentials.$(SHLIBEXT) -PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS PYTALLOC pyparam_util - -pycredentials_OBJ_FILES = $(authsrcdir)/credentials/pycredentials.o diff --git a/source4/auth/gensec/config.m4 b/source4/auth/gensec/config.m4 deleted file mode 100644 index b945afeea0..0000000000 --- a/source4/auth/gensec/config.m4 +++ /dev/null @@ -1,2 +0,0 @@ -SMB_ENABLE(gensec_krb5, $HAVE_KRB5) -SMB_ENABLE(gensec_gssapi, $HAVE_KRB5) diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk deleted file mode 100644 index 6e86aab34f..0000000000 --- a/source4/auth/gensec/config.mk +++ /dev/null @@ -1,82 +0,0 @@ -################################# -# Start SUBSYSTEM gensec -[LIBRARY::gensec] -PUBLIC_DEPENDENCIES = \ - CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba_socket LIBPACKET LIBTSOCKET UTIL_TEVENT -# End SUBSYSTEM gensec -################################# - -PC_FILES += $(gensecsrcdir)/gensec.pc - -gensec_VERSION = 0.0.1 -gensec_SOVERSION = 0 -gensec_OBJ_FILES = $(addprefix $(gensecsrcdir)/, gensec.o socket.o) - -PUBLIC_HEADERS += $(gensecsrcdir)/gensec.h - -$(eval $(call proto_header_template,$(gensecsrcdir)/gensec_proto.h,$(gensec_OBJ_FILES:.o=.c))) - -################################################ -# Start MODULE gensec_krb5 -[MODULE::gensec_krb5] -SUBSYSTEM = gensec -INIT_FUNCTION = gensec_krb5_init -PRIVATE_DEPENDENCIES = CREDENTIALS KERBEROS auth_session -# End MODULE gensec_krb5 -################################################ - -gensec_krb5_OBJ_FILES = $(addprefix $(gensecsrcdir)/, gensec_krb5.o) - -################################################ -# Start MODULE gensec_gssapi -[MODULE::gensec_gssapi] -SUBSYSTEM = gensec -INIT_FUNCTION = gensec_gssapi_init -PRIVATE_DEPENDENCIES = HEIMDAL_GSSAPI CREDENTIALS KERBEROS -# End MODULE gensec_gssapi -################################################ - -gensec_gssapi_OBJ_FILES = $(addprefix $(gensecsrcdir)/, gensec_gssapi.o) - -################################################ -# Start MODULE cyrus_sasl -[MODULE::cyrus_sasl] -SUBSYSTEM = gensec -INIT_FUNCTION = gensec_sasl_init -PRIVATE_DEPENDENCIES = CREDENTIALS SASL -# End MODULE cyrus_sasl -################################################ - -cyrus_sasl_OBJ_FILES = $(addprefix $(gensecsrcdir)/, cyrus_sasl.o) - -################################################ -# Start MODULE gensec_spnego -[MODULE::gensec_spnego] -SUBSYSTEM = gensec -INIT_FUNCTION = gensec_spnego_init -PRIVATE_DEPENDENCIES = ASN1_UTIL CREDENTIALS -# End MODULE gensec_spnego -################################################ - -gensec_spnego_OBJ_FILES = $(addprefix $(gensecsrcdir)/, spnego.o) ../libcli/auth/spnego_parse.o - -$(eval $(call proto_header_template,$(gensecsrcdir)/spnego_proto.h,$(gensec_spnego_OBJ_FILES:.o=.c))) - -################################################ -# Start MODULE gensec_schannel -[MODULE::gensec_schannel] -SUBSYSTEM = gensec -INIT_FUNCTION = gensec_schannel_init -PRIVATE_DEPENDENCIES = COMMON_SCHANNELDB NDR_SCHANNEL CREDENTIALS LIBNDR auth_session -OUTPUT_TYPE = MERGED_OBJ -# End MODULE gensec_schannel -################################################ - -gensec_schannel_OBJ_FILES = $(addprefix $(gensecsrcdir)/, schannel.o) ../libcli/auth/schannel_sign.o -$(eval $(call proto_header_template,$(gensecsrcdir)/schannel_proto.h,$(gensec_schannel_OBJ_FILES:.o=.c))) - -[PYTHON::pygensec] -PRIVATE_DEPENDENCIES = gensec PYTALLOC pyparam_util -LIBRARY_REALNAME = samba/gensec.$(SHLIBEXT) - -pygensec_OBJ_FILES = $(gensecsrcdir)/pygensec.o diff --git a/source4/auth/kerberos/config.m4 b/source4/auth/kerberos/config.m4 deleted file mode 100644 index a8d55a1287..0000000000 --- a/source4/auth/kerberos/config.m4 +++ /dev/null @@ -1,542 +0,0 @@ -# NOTE! this whole m4 file is disabled in configure.in for now - -################################################# -# KRB5 support -KRB5_CFLAGS="" -KRB5_CPPFLAGS="" -KRB5_LDFLAGS="" -KRB5_LIBS="" -with_krb5_support=auto -krb5_withval=auto -AC_MSG_CHECKING([for KRB5 support]) - -# Do no harm to the values of CFLAGS and LIBS while testing for -# Kerberos support. -AC_ARG_WITH(krb5, -[ --with-krb5=base-dir Locate Kerberos 5 support (default=auto)], - [ case "$withval" in - no) - with_krb5_support=no - AC_MSG_RESULT(no) - krb5_withval=no - ;; - yes) - with_krb5_support=yes - AC_MSG_RESULT(yes) - krb5_withval=yes - ;; - auto) - with_krb5_support=auto - AC_MSG_RESULT(auto) - krb5_withval=auto - ;; - *) - with_krb5_support=yes - AC_MSG_RESULT(yes) - krb5_withval=$withval - KRB5CONFIG="$krb5_withval/bin/krb5-config" - ;; - esac ], - AC_MSG_RESULT($with_krb5_support) -) - -if test x$with_krb5_support != x"no"; then - FOUND_KRB5=no - FOUND_KRB5_VIA_CONFIG=no - - ################################################# - # check for krb5-config from recent MIT and Heimdal kerberos 5 - AC_MSG_CHECKING(for working specified location for krb5-config) - if test x$KRB5CONFIG != "x"; then - if test -x "$KRB5CONFIG"; then - ac_save_CFLAGS=$CFLAGS - CFLAGS="";export CFLAGS - ac_save_LDFLAGS=$LDFLAGS - LDFLAGS="";export LDFLAGS - KRB5_LIBS="`$KRB5CONFIG --libs gssapi`" - KRB5_CFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`" - KRB5_CPPFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`" - CFLAGS=$ac_save_CFLAGS;export CFLAGS - LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS - FOUND_KRB5=yes - FOUND_KRB5_VIA_CONFIG=yes - AC_MSG_RESULT(yes. Found $KRB5CONFIG) - else - AC_MSG_RESULT(no. Fallback to specified directory) - fi - else - AC_MSG_RESULT(no. Fallback to finding krb5-config in path) - ################################################# - # check for krb5-config from recent MIT and Heimdal kerberos 5 - AC_PATH_PROG(KRB5CONFIG, krb5-config) - AC_MSG_CHECKING(for working krb5-config in path) - if test -x "$KRB5CONFIG"; then - ac_save_CFLAGS=$CFLAGS - CFLAGS="";export CFLAGS - ac_save_LDFLAGS=$LDFLAGS - LDFLAGS="";export LDFLAGS - KRB5_LIBS="`$KRB5CONFIG --libs gssapi`" - KRB5_CFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`" - KRB5_CPPFLAGS="`$KRB5CONFIG --cflags | sed s/@INCLUDE_des@//`" - CFLAGS=$ac_save_CFLAGS;export CFLAGS - LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS - FOUND_KRB5=yes - FOUND_KRB5_VIA_CONFIG=yes - AC_MSG_RESULT(yes. Found $KRB5CONFIG) - else - AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy) - fi - fi - - if test x$FOUND_KRB5 != x"yes"; then - ################################################# - # check for location of Kerberos 5 install - AC_MSG_CHECKING(for kerberos 5 install path) - case "$krb5_withval" in - no) - AC_MSG_RESULT(no krb5-path given) - ;; - yes) - AC_MSG_RESULT(/usr) - FOUND_KRB5=yes - ;; - *) - AC_MSG_RESULT($krb5_withval) - KRB5_CFLAGS="-I$krb5_withval/include" - KRB5_CPPFLAGS="-I$krb5_withval/include" - KRB5_LDFLAGS="-L$krb5_withval/lib" - FOUND_KRB5=yes - ;; - esac - fi - - if test x$FOUND_KRB5 != x"yes"; then - ################################################# - # see if this box has the SuSE location for the heimdal krb implementation - AC_MSG_CHECKING(for /usr/include/heimdal) - if test -d /usr/include/heimdal; then - if test -f /usr/lib/heimdal/lib/libkrb5.a; then - KRB5_CFLAGS="-I/usr/include/heimdal" - KRB5_CPPFLAGS="-I/usr/include/heimdal" - KRB5_LDFLAGS="-L/usr/lib/heimdal/lib" - AC_MSG_RESULT(yes) - else - KRB5_CFLAGS="-I/usr/include/heimdal" - KRB5_CPPFLAGS="-I/usr/include/heimdal" - AC_MSG_RESULT(yes) - fi - else - AC_MSG_RESULT(no) - fi - fi - - if test x$FOUND_KRB5 != x"yes"; then - ################################################# - # see if this box has the RedHat location for kerberos - AC_MSG_CHECKING(for /usr/kerberos) - if test -d /usr/kerberos -a -f /usr/kerberos/lib/libkrb5.a; then - KRB5_LDFLAGS="-L/usr/kerberos/lib" - KRB5_CFLAGS="-I/usr/kerberos/include" - KRB5_CPPFLAGS="-I/usr/kerberos/include" - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - fi - - ac_save_CFLAGS=$CFLAGS - ac_save_CPPFLAGS=$CPPFLAGS - ac_save_LDFLAGS=$LDFLAGS - - #MIT needs this, to let us see 'internal' parts of the headers we use - KRB5_CFLAGS="${KRB5_CFLAGS} -DKRB5_PRIVATE -DKRB5_DEPRECATED" - - #Heimdal needs this - #TODO: we need to parse KRB5_LIBS for -L path - # and set -Wl,-rpath -Wl,path - - CFLAGS="$CFLAGS $KRB5_CFLAGS" - CPPFLAGS="$CPPFLAGS $KRB5_CPPFLAGS" - LDFLAGS="$LDFLAGS $KRB5_LDFLAGS" - - KRB5_LIBS="$KRB5_LDFLAGS $KRB5_LIBS" - - # now check for krb5.h. Some systems have the libraries without the headers! - # note that this check is done here to allow for different kerberos - # include paths - AC_CHECK_HEADERS(krb5.h) - - if test x"$ac_cv_header_krb5_h" = x"no"; then - # Give a warning if KRB5 support was not explicitly requested, - # i.e with_krb5_support = auto, otherwise die with an error. - if test x"$with_krb5_support" = x"yes"; then - AC_MSG_ERROR([KRB5 cannot be supported without krb5.h]) - else - AC_MSG_WARN([KRB5 cannot be supported without krb5.h]) - fi - # Turn off AD support and restore CFLAGS and LIBS variables - with_krb5_support="no" - fi - - CFLAGS=$ac_save_CFLAGS - CPPFLAGS=$ac_save_CPPFLAGS - LDFLAGS=$ac_save_LDFLAGS -fi - -# Now we have determined whether we really want KRB5 support - -if test x"$with_krb5_support" != x"no"; then - ac_save_CFLAGS=$CFLAGS - ac_save_CPPFLAGS=$CPPFLAGS - ac_save_LDFLAGS=$LDFLAGS - ac_save_LIBS=$LIBS - - CFLAGS="$CFLAGS $KRB5_CFLAGS" - CPPFLAGS="$CPPFLAGS $KRB5_CPPFLAGS" - LDFLAGS="$LDFLAGS $KRB5_LDFLAGS" - - # now check for gssapi headers. This is also done here to allow for - # different kerberos include paths - AC_CHECK_HEADERS(gssapi.h gssapi_krb5.h gssapi/gssapi.h gssapi/gssapi_generic.h gssapi/gssapi_krb5.h com_err.h) - - - # Heimdal checks. - # But only if we didn't have a krb5-config to tell us this already - if test x"$FOUND_KRB5_VIA_CONFIG" != x"yes"; then - ################################################################## - # we might need the k5crypto and com_err libraries on some systems - AC_CHECK_LIB_EXT(com_err, KRB5_LIBS, _et_list) - AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data) - - AC_CHECK_LIB_EXT(crypto, KRB5_LIBS, des_set_key) - AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator) - AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec) - fi - - # Heimdal checks. On static Heimdal gssapi must be linked before krb5. - AC_CHECK_LIB_EXT(gssapi, KRB5_LIBS, gss_display_status,[],[], - AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])) - - ######################################################## - # now see if we can find the krb5 libs in standard paths - # or as specified above - AC_CHECK_LIB_EXT(krb5, KRB5_LIBS, krb5_mk_req_extended) - AC_CHECK_LIB_EXT(krb5, KRB5_LIBS, krb5_kt_compare) - - ######################################################## - # now see if we can find the gssapi libs in standard paths - if test x"$ac_cv_lib_ext_gssapi_gss_display_status" != x"yes"; then - AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS,gss_display_status,[],[], - AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])) - fi - - AC_CHECK_FUNC_EXT(krb5_set_real_time, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_set_default_in_tkt_etypes, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_set_default_tgs_ktypes, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_principal2salt, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_use_enctype, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_string_to_key, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_get_pw_salt, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_string_to_key_salt, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_auth_con_setkey, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_auth_con_setuseruserkey, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_locate_kdc, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_get_permitted_enctypes, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_get_default_in_tkt_etypes, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_free_ktypes, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_free_data_contents, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_principal_get_comp_string, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_free_unparsed_name, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_free_keytab_entry_contents, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_kt_free_entry, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_krbhst_get_addrinfo, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_verify_checksum, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_c_verify_checksum, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_ticket_get_authorization_data_type, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_krbhst_get_addrinfo, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_c_enctype_compare, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_enctypes_compatible_keys, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_get_error_string, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_free_error_string, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_get_error_message, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_free_error_message, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_initlog, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_addlog_func, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_set_warn_dest, $KRB5_LIBS) - - LIBS="$LIBS $KRB5_LIBS" - - AC_CACHE_CHECK([for krb5_log_facility type], - samba_cv_HAVE_KRB5_LOG_FACILITY,[ - AC_TRY_COMPILE([#include ], - [krb5_log_facility block;], - samba_cv_HAVE_KRB5_LOG_FACILITY=yes, - samba_cv_HAVE_KRB5_LOG_FACILITY=no)]) - - if test x"$samba_cv_HAVE_KRB5_LOG_FACILITY" = x"yes"; then - AC_DEFINE(HAVE_KRB5_LOG_FACILITY,1, - [Whether the type krb5_log_facility exists]) - fi - - AC_CACHE_CHECK([for krb5_encrypt_block type], - samba_cv_HAVE_KRB5_ENCRYPT_BLOCK,[ - AC_TRY_COMPILE([#include ], - [krb5_encrypt_block block;], - samba_cv_HAVE_KRB5_ENCRYPT_BLOCK=yes, - samba_cv_HAVE_KRB5_ENCRYPT_BLOCK=no)]) - - if test x"$samba_cv_HAVE_KRB5_ENCRYPT_BLOCK" = x"yes"; then - AC_DEFINE(HAVE_KRB5_ENCRYPT_BLOCK,1, - [Whether the type krb5_encrypt_block exists]) - fi - - AC_CACHE_CHECK([for addrtype in krb5_address], - samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS,[ - AC_TRY_COMPILE([#include ], - [krb5_address kaddr; kaddr.addrtype = ADDRTYPE_INET;], - samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS=yes, - samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS=no)]) - if test x"$samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS" = x"yes"; then - AC_DEFINE(HAVE_ADDRTYPE_IN_KRB5_ADDRESS,1, - [Whether the krb5_address struct has a addrtype property]) - fi - - AC_CACHE_CHECK([for addr_type in krb5_address], - samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS,[ - AC_TRY_COMPILE([#include ], - [krb5_address kaddr; kaddr.addr_type = KRB5_ADDRESS_INET;], - samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS=yes, - samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS=no)]) - if test x"$samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS" = x"yes"; then - AC_DEFINE(HAVE_ADDR_TYPE_IN_KRB5_ADDRESS,1, - [Whether the krb5_address struct has a addr_type property]) - fi - - AC_CACHE_CHECK([for enc_part2 in krb5_ticket], - samba_cv_HAVE_KRB5_TKT_ENC_PART2,[ - AC_TRY_COMPILE([#include ], - [krb5_ticket tkt; tkt.enc_part2->authorization_data[0]->contents = NULL;], - samba_cv_HAVE_KRB5_TKT_ENC_PART2=yes, - samba_cv_HAVE_KRB5_TKT_ENC_PART2=no)]) - if test x"$samba_cv_HAVE_KRB5_TKT_ENC_PART2" = x"yes"; then - AC_DEFINE(HAVE_KRB5_TKT_ENC_PART2,1, - [Whether the krb5_ticket struct has a enc_part2 property]) - fi - - AC_CACHE_CHECK([for keyblock in krb5_creds], - samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS,[ - AC_TRY_COMPILE([#include ], - [krb5_creds creds; krb5_keyblock kb; creds.keyblock = kb;], - samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS=yes, - samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS=no)]) - - if test x"$samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS" = x"yes"; then - AC_DEFINE(HAVE_KRB5_KEYBLOCK_IN_CREDS,1, - [Whether the krb5_creds struct has a keyblock property]) - fi - - AC_CACHE_CHECK([for session in krb5_creds], - samba_cv_HAVE_KRB5_SESSION_IN_CREDS,[ - AC_TRY_COMPILE([#include ], - [krb5_creds creds; krb5_keyblock kb; creds.session = kb;], - samba_cv_HAVE_KRB5_SESSION_IN_CREDS=yes, - samba_cv_HAVE_KRB5_SESSION_IN_CREDS=no)]) - - if test x"$samba_cv_HAVE_KRB5_SESSION_IN_CREDS" = x"yes"; then - AC_DEFINE(HAVE_KRB5_SESSION_IN_CREDS,1, - [Whether the krb5_creds struct has a session property]) - fi - - AC_CACHE_CHECK([for keyvalue in krb5_keyblock], - samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE,[ - AC_TRY_COMPILE([#include ], - [krb5_keyblock key; key.keyvalue.data = NULL;], - samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE=yes, - samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE=no)]) - if test x"$samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE" = x"yes"; then - AC_DEFINE(HAVE_KRB5_KEYBLOCK_KEYVALUE,1, - [Whether the krb5_keyblock struct has a keyvalue property]) - fi - - AC_CACHE_CHECK([for ENCTYPE_ARCFOUR_HMAC_MD5], - samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5,[ - AC_TRY_COMPILE([#include ], - [krb5_enctype enctype; enctype = ENCTYPE_ARCFOUR_HMAC_MD5;], - samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5=yes, - samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5=no)]) - AC_CACHE_CHECK([for KEYTYPE_ARCFOUR_56], - samba_cv_HAVE_KEYTYPE_ARCFOUR_56,[ - AC_TRY_COMPILE([#include ], - [krb5_keytype keytype; keytype = KEYTYPE_ARCFOUR_56;], - samba_cv_HAVE_KEYTYPE_ARCFOUR_56=yes, - samba_cv_HAVE_KEYTYPE_ARCFOUR_56=no)]) - # Heimdals with KEYTYPE_ARCFOUR but not KEYTYPE_ARCFOUR_56 are broken - # w.r.t. arcfour and windows, so we must not enable it here - if test x"$samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5" = x"yes" -a\ - x"$samba_cv_HAVE_KEYTYPE_ARCFOUR_56" = x"yes"; then - AC_DEFINE(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5,1, - [Whether the ENCTYPE_ARCFOUR_HMAC_MD5 key type is available]) - fi - - AC_CACHE_CHECK([for AP_OPTS_USE_SUBKEY], - samba_cv_HAVE_AP_OPTS_USE_SUBKEY,[ - AC_TRY_COMPILE([#include ], - [krb5_flags ap_options; ap_options = AP_OPTS_USE_SUBKEY;], - samba_cv_HAVE_AP_OPTS_USE_SUBKEY=yes, - samba_cv_HAVE_AP_OPTS_USE_SUBKEY=no)]) - if test x"$samba_cv_HAVE_AP_OPTS_USE_SUBKEY" = x"yes"; then - AC_DEFINE(HAVE_AP_OPTS_USE_SUBKEY,1, - [Whether the AP_OPTS_USE_SUBKEY ap option is available]) - fi - - AC_CACHE_CHECK([for KV5M_KEYTAB], - samba_cv_HAVE_KV5M_KEYTAB,[ - AC_TRY_COMPILE([#include ], - [krb5_keytab_entry entry; entry.magic = KV5M_KEYTAB;], - samba_cv_HAVE_KV5M_KEYTAB=yes, - samba_cv_HAVE_KV5M_KEYTAB=no)]) - if test x"$samba_cv_HAVE_KV5M_KEYTAB" = x"yes"; then - AC_DEFINE(HAVE_KV5M_KEYTAB,1, - [Whether the KV5M_KEYTAB option is available]) - fi - - AC_CACHE_CHECK([for the krb5_princ_component macro], - samba_cv_HAVE_KRB5_PRINC_COMPONENT,[ - AC_TRY_LINK([#include ], - [const krb5_data *pkdata; krb5_context context; krb5_principal principal; - pkdata = krb5_princ_component(context, principal, 0);], - samba_cv_HAVE_KRB5_PRINC_COMPONENT=yes, - samba_cv_HAVE_KRB5_PRINC_COMPONENT=no)]) - if test x"$samba_cv_HAVE_KRB5_PRINC_COMPONENT" = x"yes"; then - AC_DEFINE(HAVE_KRB5_PRINC_COMPONENT,1, - [Whether krb5_princ_component is available]) - fi - - AC_CACHE_CHECK([for key in krb5_keytab_entry], - samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY,[ - AC_TRY_COMPILE([#include ], - [krb5_keytab_entry entry; krb5_keyblock e; entry.key = e;], - samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY=yes, - samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY=no)]) - if test x"$samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY" = x"yes"; then - AC_DEFINE(HAVE_KRB5_KEYTAB_ENTRY_KEY,1, - [Whether krb5_keytab_entry has key member]) - fi - - AC_CACHE_CHECK([for keyblock in krb5_keytab_entry], - samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK,[ - AC_TRY_COMPILE([#include ], - [krb5_keytab_entry entry; entry.keyblock.keytype = 0;], - samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK=yes, - samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK=no)]) - if test x"$samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK" = x"yes"; then - AC_DEFINE(HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK,1, - [Whether krb5_keytab_entry has keyblock member]) - fi - - AC_CACHE_CHECK([for WRFILE: keytab support], - samba_cv_HAVE_WRFILE_KEYTAB,[ - AC_TRY_RUN([ - #include - main() - { - krb5_context context; - krb5_keytab keytab; - krb5_init_context(&context); - return krb5_kt_resolve(context, "WRFILE:api", &keytab); - }], - samba_cv_HAVE_WRFILE_KEYTAB=yes, - samba_cv_HAVE_WRFILE_KEYTAB=no)]) - if test x"$samba_cv_HAVE_WRFILE_KEYTAB" = x"yes"; then - AC_DEFINE(HAVE_WRFILE_KEYTAB,1, - [Whether the WRFILE:-keytab is supported]) - fi - - AC_CACHE_CHECK([for krb5_princ_realm returns krb5_realm or krb5_data], - samba_cv_KRB5_PRINC_REALM_RETURNS_REALM,[ - AC_TRY_COMPILE([#include ], - [krb5_context context;krb5_principal principal;krb5_realm realm; - realm = *krb5_princ_realm(context, principal);], - samba_cv_KRB5_PRINC_REALM_RETURNS_REALM=yes, - samba_cv_KRB5_PRINC_REALM_RETURNS_REALM=no)]) - if test x"$samba_cv_KRB5_PRINC_REALM_RETURNS_REALM" = x"yes"; then - AC_DEFINE(KRB5_PRINC_REALM_RETURNS_REALM,1, - [Whether krb5_princ_realm returns krb5_realm or krb5_data]) - fi - - # TODO: check all gssapi headers for this - AC_CACHE_CHECK([for GSS_C_DCE_STYLE in gssapi.h], - samba_cv_GSS_C_DCE_STYLE,[ - AC_TRY_COMPILE([#include ], - [int flags = GSS_C_DCE_STYLE;], - samba_cv_GSS_C_DCE_STYLE=yes, - samba_cv_GSS_C_DCE_STYLE=no)]) - - AC_CHECK_FUNC_EXT(gsskrb5_get_initiator_subkey, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(gsskrb5_extract_authz_data_from_sec_context, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(gsskrb5_register_acceptor_identity, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(gss_krb5_ccache_name, $KRB5_LIBS) - if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" = x"yes"; then - AC_DEFINE(HAVE_KRB5,1,[Whether to have KRB5 support]) - AC_MSG_CHECKING(whether KRB5 support is used) - SMB_ENABLE(KRB5,YES) - AC_MSG_RESULT(yes) - echo "KRB5_CFLAGS: ${KRB5_CFLAGS}" - echo "KRB5_CPPFLAGS: ${KRB5_CPPFLAGS}" - echo "KRB5_LDFLAGS: ${KRB5_LDFLAGS}" - echo "KRB5_LIBS: ${KRB5_LIBS}" - else - if test x"$with_krb5_support" = x"yes"; then - AC_MSG_ERROR(a working krb5 library is needed for KRB5 support) - else - AC_MSG_WARN(a working krb5 library is needed for KRB5 support) - fi - KRB5_CFLAGS="" - KRB5_CPPFLAGS="" - KRB5_LDFLAGS="" - KRB5_LIBS="" - with_krb5_support=no - fi - - # checks if we have access to a libkdc - # and can use it for our builtin kdc server_service - KDC_CFLAGS="" - KDC_CPPFLAGS="" - KDC_DLFLAGS="" - KDC_LIBS="" - AC_CHECK_HEADERS(kdc.h) - AC_CHECK_LIB_EXT(kdc, KDC_LIBS, krb5_kdc_default_config) - AC_CHECK_LIB_EXT(hdb, KDC_LIBS, hdb_generate_key_set_password) - - AC_MSG_CHECKING(whether libkdc is used) - if test x"$ac_cv_header_kdc_h" = x"yes"; then - if test x"$ac_cv_lib_ext_kdc_krb5_kdc_default_config" = x"yes"; then - if test x"$ac_cv_lib_ext_hdb_hdb_generate_key_set_password" = x"yes"; then - SMB_ENABLE(KDC,YES) - AC_MSG_RESULT(yes) - echo "KDC_LIBS: ${KDC_LIBS}" - else - AC_MSG_RESULT(no) - fi - else - AC_MSG_RESULT(no) - fi - else - AC_MSG_RESULT(no) - fi - - CFLAGS=$ac_save_CFLAGS - CPPFLAGS=$ac_save_CPPFLAGS - LDFLAGS=$ac_save_LDFLAGS - LIBS="$ac_save_LIBS" - - # as a nasty hack add the krb5 stuff to the global vars, - # at some point this should not be needed anymore when the build system - # can handle that alone - CFLAGS="$CFLAGS $KRB5_CFLAGS" - CPPFLAGS="$CPPFLAGS $KRB5_CPPFLAGS" - LDFLAGS="$LDFLAGS $KRB5_LDFLAGS" -fi - -SMB_EXT_LIB(KRB5,[${KRB5_LIBS}],[${KRB5_CFLAGS}],[${KRB5_CPPFLAGS}],[${KRB5_LDFLAGS}]) -SMB_EXT_LIB(KDC,[${KDC_LIBS}],[${KDC_CFLAGS}],[${KDC_CPPFLAGS}],[${KDC_LDFLAGS}]) diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk deleted file mode 100644 index 609b036b64..0000000000 --- a/source4/auth/kerberos/config.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################# -# Start SUBSYSTEM KERBEROS -[SUBSYSTEM::KERBEROS] -PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba_socket LIBCLI_RESOLVE -PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam_reply LIBTEVENT LIBPACKET LIBNDR -# End SUBSYSTEM KERBEROS -################################# - -KERBEROS_OBJ_FILES = $(addprefix $(authsrcdir)/kerberos/, \ - kerberos.o \ - clikrb5.o \ - kerberos_heimdal.o \ - kerberos_pac.o \ - gssapi_parse.o \ - krb5_init_context.o \ - keytab_copy.o) - -$(eval $(call proto_header_template,$(authsrcdir)/kerberos/proto.h,$(KERBEROS_OBJ_FILES:.o=.c))) - diff --git a/source4/auth/ntlm/config.mk b/source4/auth/ntlm/config.mk deleted file mode 100644 index 6c75ae842d..0000000000 --- a/source4/auth/ntlm/config.mk +++ /dev/null @@ -1,80 +0,0 @@ -# NTLM auth server subsystem - -####################### -# Start MODULE auth_sam -[MODULE::auth_sam_module] -INIT_FUNCTION = auth_sam_init -SUBSYSTEM = auth -PRIVATE_DEPENDENCIES = \ - SAMDB auth_sam ntlm_check -# End MODULE auth_sam -####################### - -auth_sam_module_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_sam.o) - -####################### -# Start MODULE auth_anonymous -[MODULE::auth_anonymous] -INIT_FUNCTION = auth_anonymous_init -SUBSYSTEM = auth -# End MODULE auth_anonymous -####################### - -auth_anonymous_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_anonymous.o) - -####################### -# Start MODULE auth_anonymous -[MODULE::auth_server] -INIT_FUNCTION = auth_server_init -SUBSYSTEM = auth -PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBCLI_SMB -# End MODULE auth_server -####################### - -auth_server_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_server.o) - -####################### -# Start MODULE auth_winbind -[MODULE::auth_winbind] -INIT_FUNCTION = auth_winbind_init -SUBSYSTEM = auth -PRIVATE_DEPENDENCIES = NDR_WINBIND MESSAGING LIBWINBIND-CLIENT LIBWBCLIENT -# End MODULE auth_winbind -####################### - -auth_winbind_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_winbind.o) - -####################### -# Start MODULE auth_developer -[MODULE::auth_developer] -INIT_FUNCTION = auth_developer_init -SUBSYSTEM = auth -# End MODULE auth_developer -####################### - -auth_developer_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_developer.o) - -[MODULE::auth_unix] -INIT_FUNCTION = auth_unix_init -SUBSYSTEM = auth -PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER UID_WRAPPER LIBTSOCKET - -auth_unix_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth_unix.o) - -[SUBSYSTEM::PAM_ERRORS] - -#VERSION = 0.0.1 -#SO_VERSION = 0 -PAM_ERRORS_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, pam_errors.o) - -[MODULE::auth] -INIT_FUNCTION = server_service_auth_init -SUBSYSTEM = service -OUTPUT_TYPE = MERGED_OBJ -PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSECURITY SAMDB CREDENTIALS UTIL_TEVENT - -auth_OBJ_FILES = $(addprefix $(authsrcdir)/ntlm/, auth.o auth_util.o auth_simple.o) -$(eval $(call proto_header_template,$(authsrcdir)/ntlm/auth_proto.h,$(auth_OBJ_FILES:.o=.c))) - -# PUBLIC_HEADERS += auth/auth.h - diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk deleted file mode 100644 index 1be5fa98e7..0000000000 --- a/source4/auth/ntlmssp/config.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################ -# Start MODULE gensec_ntlmssp -[MODULE::gensec_ntlmssp] -SUBSYSTEM = gensec -INIT_FUNCTION = gensec_ntlmssp_init -PRIVATE_DEPENDENCIES = MSRPC_PARSE CREDENTIALS -OUTPUT_TYPE = MERGED_OBJ -# End MODULE gensec_ntlmssp -################################################ - -gensec_ntlmssp_OBJ_FILES = $(addprefix $(authsrcdir)/ntlmssp/, ntlmssp.o ntlmssp_sign.o ntlmssp_client.o ntlmssp_server.o) - -$(eval $(call proto_header_template,$(authsrcdir)/ntlmssp/proto.h,$(gensec_ntlmssp_OBJ_FILES:.o=.c))) -- cgit