sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

krb5: Require krb5_string_to_key be available to build with krb5

Browse Source
This commit is contained in:
Andrew Bartlett 2012-01-05 11:39:14 +11:00
parent cfe68f2d5f
commit 19deda26d0
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcli/auth/krb5_wrap.c
View File

@ -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,

6
source3/configure.in
View File

@ -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

3
source3/wscript
View File

@ -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")