diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-01-05 11:39:14 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-01-10 21:50:07 +0100 |
| commit | 19deda26d0ee61b5e5b41a09181d156b9159663d (patch) | |
| tree | 8f367732fd0af720232c436ecb9ba1c45e21b8b8 | |
| parent | cfe68f2d5fbd749c3dce7a1a5fa67d2d0a631bf2 (diff) | |
| download | samba-19deda26d0ee61b5e5b41a09181d156b9159663d.tar.gz samba-19deda26d0ee61b5e5b41a09181d156b9159663d.tar.bz2 samba-19deda26d0ee61b5e5b41a09181d156b9159663d.zip | |
krb5: Require krb5_string_to_key be available to build with krb5
| -rw-r--r-- | libcli/auth/krb5_wrap.c | 2 | ||||
| -rw-r--r-- | source3/configure.in | 6 | ||||
| -rw-r--r-- | source3/wscript | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/libcli/auth/krb5_wrap.c b/libcli/auth/krb5_wrap.c index a16a7cdffa..f528822b19 100644 --- a/libcli/auth/krb5_wrap.c +++ b/libcli/auth/krb5_wrap.c @@ -27,7 +27,7 @@ #include "libcli/auth/krb5_wrap.h" #include "librpc/gen_ndr/krb5pac.h" -#if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_STRING_TO_KEY) && defined(HAVE_KRB5_ENCRYPT_BLOCK) +#if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_ENCRYPT_BLOCK) int create_kerberos_key_from_string_direct(krb5_context context, krb5_principal host_princ, krb5_data *password, diff --git a/source3/configure.in b/source3/configure.in index 153a610501..18c6250361 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -4464,6 +4464,12 @@ if test x"$with_ads_support" != x"no"; then use_ads=no fi + if test x"$ac_cv_func_ext_krb5_string_to_key" != x"yes" + then + AC_MSG_WARN(krb5_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" then diff --git a/source3/wscript b/source3/wscript index 00da1948a6..35f2b79024 100644 --- a/source3/wscript +++ b/source3/wscript @@ -771,6 +771,9 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab); if not conf.CONFIG_SET('HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM'): Logs.warn("krb5_principal_compare_any_realm not found in -lkrb5") use_ads=False + if not conf.CONFIG_SET('HAVE_KRB5_STRING_TO_KEY'): + Logs.warn("krb5_string_to_key not found in -lkrb5") + use_ads=False if not conf.CONFIG_SET('HAVE_KRB5_PRINCIPAL2SALT') and \ not conf.CONFIG_SET('HAVE_KRB5_GET_PW_SALT'): Logs.warn("no CREATE_KEY_FUNCTIONS detected") |