diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-05-30 17:44:42 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-05-30 12:55:39 +0200 |
| commit | c8000cad5598831b11be7788e4356122beb39491 (patch) | |
| tree | 7972e09b44b8f3b9023aa93084a76420520cf955 | |
| parent | a49e771a93d54b0f3475242d5e74e09c130c3fac (diff) | |
| download | samba-c8000cad5598831b11be7788e4356122beb39491.tar.gz samba-c8000cad5598831b11be7788e4356122beb39491.tar.bz2 samba-c8000cad5598831b11be7788e4356122beb39491.zip | |
s3-build: Fix configure checks for Heimdal
A series of small errors meant that all Heimdal versions became
unsupported, when for the autoconf build, some versions have what we
need.
Andrew Bartlett
| -rw-r--r-- | source3/configure.in | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/source3/configure.in b/source3/configure.in index 70a877da38..ea89fa2fe7 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -3542,6 +3542,12 @@ if test x"$with_ads_support" != x"no"; then AC_DEFINE(HAVE_GSSAPI, , [Whether the platform has GSSAPI support]) fi + # This is for FreeBSD (and possibly others). gss_mech_krb5 is a + # #define to GSS_KRB5_MECHANISM, which is defined in -lgssapi_krb5 + # Also, gsskrb5_extract_authz_data_from_sec_context is in -lgssapi_krb5 + AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS, GSS_KRB5_MECHANISM, + [KRB5_LIBS="$KRB5_LIBS -lgssapi_krb5"]) + 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_enctypes, $KRB5_LIBS) @@ -3567,6 +3573,7 @@ if test x"$with_ads_support" != x"no"; then AC_CHECK_FUNC_EXT(krb5_principal_compare_any_realm, $KRB5_LIBS) AC_CHECK_FUNC_EXT(krb5_parse_name_norealm, $KRB5_LIBS) AC_CHECK_FUNC_EXT(krb5_princ_size, $KRB5_LIBS) + AC_CHECK_FUNC_EXT(krb5_make_principal, $KRB5_LIBS) AC_CHECK_FUNC_EXT(krb5_principal_get_num_comp, $KRB5_LIBS) AC_CHECK_FUNC_EXT(krb5_get_init_creds_opt_set_pac_request, $KRB5_LIBS) AC_CHECK_FUNC_EXT(krb5_get_renewed_creds, $KRB5_LIBS) @@ -3598,11 +3605,6 @@ if test x"$with_ads_support" != x"no"; then AC_CHECK_FUNC_EXT(gss_inquire_sec_context_by_oid, $KRB5_LIBS) AC_CHECK_FUNC_EXT(gss_wrap_iov, $KRB5_LIBS) - # This is for FreeBSD (and possibly others). gss_mech_krb5 is a - # #define to GSS_KRB5_MECHANISM, which is defined in -lgssapi_krb5 - AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS, GSS_KRB5_MECHANISM, - [KRB5_LIBS="$KRB5_LIBS -lgssapi_krb5"]) - # MIT krb5 1.8 does not expose this call (yet) AC_CHECK_DECLS(krb5_get_credentials_for_user, [], [], [#include <krb5.h>]) @@ -4068,17 +4070,15 @@ if test x"$with_ads_support" != x"no"; then use_ads=no fi - if test x"$ac_cv_func_ext_krb5_c_string_to_key" != x"yes" - then - AC_MSG_WARN(krb5_c_string_to_key not found in -lkrb5) - use_ads=no - fi - - if test x"$ac_cv_func_ext_krb5_principal2salt" != x"yes" -a \ - x"$ac_cv_func_ext_krb5_get_pw_salt" != x"yes" + if test x"$ac_cv_func_ext_krb5_principal2salt" != x"yes" -o \ + x"$ac_cv_func_ext_krb5_c_string_to_key" != x"yes" then - AC_MSG_WARN(no CREATE_KEY_FUNCTIONS detected) - use_ads=no + if test x"$ac_cv_func_ext_krb5_get_pw_salt" != x"yes" -o \ + x"$ac_cv_func_ext_krb5_string_to_key_salt" != x"yes" + then + AC_MSG_WARN(no CREATE_KEY_FUNCTIONS detected) + use_ads=no + fi fi if test x"$ac_cv_func_ext_krb5_get_permitted_enctypes" != x"yes" -a \ |