summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-03-12 19:52:33 +1100
committerStefan Metzmacher <metze@samba.org>2012-04-03 19:19:33 +0200
commitfba028afbd65764074fd7c6da47dfff6142ccd6e (patch)
treeb09c819f1667c9063a19a32e0b6ed79d9ef61b02 /source3
parentbc3e52d9d01e6884b1d9473f6b13d07ecaad9c02 (diff)
downloadsamba-fba028afbd65764074fd7c6da47dfff6142ccd6e.tar.gz
samba-fba028afbd65764074fd7c6da47dfff6142ccd6e.tar.bz2
samba-fba028afbd65764074fd7c6da47dfff6142ccd6e.zip
build: Remove checks for krb5_decode_ap_req, free_AP_REQ and KRB5_TICKET_HAS_KEYINFO
Signed-off-by: Stefan Metzmacher <metze@samba.org> Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Tue Apr 3 19:19:33 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in45
-rw-r--r--source3/wscript21
2 files changed, 1 insertions, 65 deletions
diff --git a/source3/configure.in b/source3/configure.in
index d7cc0f850e..6828a2e5d0 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3879,8 +3879,6 @@ if test x"$with_ads_support" != x"no"; then
AC_CHECK_FUNC_EXT(krb5_krbhst_get_addrinfo, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_crypto_init, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_crypto_destroy, $KRB5_LIBS)
- AC_CHECK_FUNC_EXT(krb5_decode_ap_req, $KRB5_LIBS)
- AC_CHECK_FUNC_EXT(free_AP_REQ, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_c_verify_checksum, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_principal_compare_any_realm, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_parse_name_norealm, $KRB5_LIBS)
@@ -3923,30 +3921,6 @@ if test x"$with_ads_support" != x"no"; then
LIBS="$KRB5_LIBS $LIBS"
- AC_CACHE_CHECK(whether krb5_ticket contains kvno and enctype,
- smb_krb5_cv_ticket_has_keyinfo,
- [
- AC_TRY_COMPILE(
- [
- #include <krb5.h>
- ],
- [
- krb5_ticket ticket;
- krb5_kvno kvno;
- krb5_enctype enctype;
-
- enctype = ticket.enc_part.enctype;
- kvno = ticket.enc_part.kvno;
- ],
- [ smb_krb5_cv_ticket_has_keyinfo=yes ],
- [ smb_krb5_cv_ticket_has_keyinfo=no ])
- ])
-
- if test x"$smb_krb5_cv_ticket_has_keyinfo" = x"yes" ; then
- AC_DEFINE(KRB5_TICKET_HAS_KEYINFO, 1,
- [Whether the krb5_ticket structure contains the kvno and enctype])
- fi
-
AC_CACHE_CHECK(whether krb5_get_init_creds_opt_free takes a context argument,
smb_krb5_cv_creds_opt_free_context,
[
@@ -4448,25 +4422,6 @@ if test x"$with_ads_support" != x"no"; then
use_ads=no
fi
- if test x"$smb_krb5_cv_ticket_has_keyinfo" != x"yes" ; then
-
- # We only need the following functions if we can't get the enctype
- # and kvno out of the ticket directly (ie. on Heimdal).
-
- if test x"$ac_cv_func_ext_free_AP_REQ" != x"yes"
- then
- AC_MSG_WARN(no KRB5_AP_REQ_FREE_FUNCTION detected)
- use_ads=no
- fi
-
- if test x"$ac_cv_func_ext_krb5_decode_ap_req" != x"yes"
- then
- AC_MSG_WARN(no KRB5_AP_REQ_DECODING_FUNCTION detected)
- use_ads=no
- fi
-
- fi
-
if test x"$ac_cv_func_ext_gss_get_name_attribute" != x"yes" ; then
if test x"$ac_cv_func_ext_gsskrb5_extract_authz_data_from_sec_context" != x"yes" -o \
x"$ac_cv_func_ext_gss_inquire_sec_context_by_oid" != x"yes"
diff --git a/source3/wscript b/source3/wscript
index d8be824b63..dc80bdbbfd 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -583,7 +583,7 @@ krb5_get_default_in_tkt_etypes krb5_free_data_contents
krb5_principal_get_comp_string krb5_free_unparsed_name
krb5_free_keytab_entry_contents krb5_kt_free_entry krb5_krbhst_init
krb5_krbhst_get_addrinfo
-krb5_crypto_init krb5_crypto_destroy krb5_decode_ap_req free_AP_REQ
+krb5_crypto_init krb5_crypto_destroy
krb5_c_verify_checksum krb5_principal_compare_any_realm
krb5_parse_name_norealm krb5_princ_size krb5_get_init_creds_opt_set_pac_request
krb5_get_renewed_creds krb5_free_error_contents
@@ -617,16 +617,6 @@ krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''',
conf.CHECK_TYPE('krb5_encrypt_block', headers='krb5.h')
conf.CHECK_CODE('''
-krb5_ticket ticket;
-krb5_kvno kvno;
-krb5_enctype enctype;
-enctype = ticket.enc_part.enctype;
-kvno = ticket.enc_part.kvno;
-''',
- 'KRB5_TICKET_HAS_KEYINFO',
- headers='krb5.h', link=False,
- msg="Checking whether the krb5_ticket structure contains the kvno and enctype")
- conf.CHECK_CODE('''
krb5_context ctx;
krb5_get_init_creds_opt *opt = NULL;
krb5_get_init_creds_opt_free(ctx, opt);
@@ -779,15 +769,6 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
if not conf.CONFIG_SET('HAVE_KRB5_C_VERIFY_CHECKSUM'):
Logs.warn("krb5_c_verify_checksum_compare not found in -lkrb5")
use_ads=False
- if not conf.CONFIG_SET('KRB5_TICKET_HAS_KEYINFO'):
- # We only need the following functions if we can't get the enctype
- # and kvno out of the ticket directly (ie. on Heimdal).
- if not conf.CONFIG_SET('HAVE_FREE_AP_REQ'):
- Logs.warn("no KRB5_AP_REQ_FREE_FUNCTION detected")
- use_ads=False
- if not conf.CONFIG_SET('HAVE_KRB5_DECODE_AP_REQ'):
- Logs.warn("no KRB5_AP_REQ_DECODING_FUNCTION detected")
- use_ads=False
# We don't actually use
# gsskrb5_extract_authz_data_from_sec_context, but it is a