summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2012-05-31 12:44:50 +0300
committerAndreas Schneider <asn@cryptomilk.org>2012-06-01 11:23:21 +0200
commit6e9aca7d4100e3c0f3a9b0ffe21fb3b4a8a5c87f (patch)
tree8bef4e641db762f625660d0a8932f8b9229deb8c
parentf8c447b1a48eaf12dcf70b92fd7525c4ad26c246 (diff)
downloadsamba-6e9aca7d4100e3c0f3a9b0ffe21fb3b4a8a5c87f.tar.gz
samba-6e9aca7d4100e3c0f3a9b0ffe21fb3b4a8a5c87f.tar.bz2
samba-6e9aca7d4100e3c0f3a9b0ffe21fb3b4a8a5c87f.zip
waf: check for krb5_create_checksum and krb5_creds.flags for some Heimdal versions
Signed-off-by: Andreas Schneider <asn@samba.org> Autobuild-User: Andreas Schneider <asn@cryptomilk.org> Autobuild-Date: Fri Jun 1 11:23:21 CEST 2012 on sn-devel-104
-rw-r--r--lib/krb5_wrap/krb5_samba.c4
-rw-r--r--source3/configure.in12
-rwxr-xr-xsource4/heimdal_build/wscript_configure1
-rw-r--r--wscript_configure_system_mitkrb515
4 files changed, 29 insertions, 3 deletions
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 572d39ebf5..dc90f19075 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -2162,7 +2162,11 @@ krb5_error_code smb_krb5_cc_get_lifetime(krb5_context context,
}
while ((kerr = krb5_cc_next_cred(context, id, &cursor, &cred)) == 0) {
+#ifndef HAVE_FLAGS_IN_KRB5_CREDS
if (cred.ticket_flags & TKT_FLG_INITIAL) {
+#else
+ if (cred.flags.b.initial) {
+#endif
if (now < cred.times.endtime) {
*t = (time_t) (cred.times.endtime - now);
}
diff --git a/source3/configure.in b/source3/configure.in
index ea89fa2fe7..06b51dba6e 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3596,6 +3596,7 @@ if test x"$with_ads_support" != x"no"; then
AC_CHECK_FUNC_EXT(krb5_cc_get_lifetime, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_cc_retrieve_cred, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_free_checksum_contents, $KRB5_LIBS)
+ AC_CHECK_FUNC_EXT(krb5_create_checksum, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_c_make_checksum, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(gss_krb5_import_cred, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(gss_get_name_attribute, $KRB5_LIBS)
@@ -4006,6 +4007,17 @@ if test x"$with_ads_support" != x"no"; then
AC_HAVE_DECL(KRB5_PDU_NONE,[#include <krb5.h>])
+ AC_CACHE_CHECK([for flags in krb5_creds],
+ samba_cv_HAVE_FLAGS_IN_KRB5_CREDS,[
+ AC_TRY_COMPILE([#include <krb5.h>],
+ [krb5_creds creds; creds.flags.b.initial = 0;],
+ samba_cv_HAVE_FLAGS_IN_KRB5_CREDS=yes,
+ samba_cv_HAVE_FLAGS_IN_KRB5_CREDS=no)])
+
+ if test x"$samba_cv_HAVE_FLAGS_IN_KRB5_CREDS" = x"yes"; then
+ AC_DEFINE(HAVE_FLAGS_IN_KRB5_CREDS,1,
+ [Whether the krb5_creds struct has a flags property])
+ fi
#
#
# Now the decisions whether we can support krb5
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index e8dab6800a..ea854f2e88 100755
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -156,6 +156,7 @@ conf.define('HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96', 1)
conf.define('HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96', 1)
conf.define('HAVE_KRB5_PRINCIPAL_GET_NUM_COMP', 1)
conf.define('HAVE_GSSAPI_GSSAPI_SPNEGO_H', 1)
+conf.define('HAVE_FLAGS_IN_KRB5_CREDS', 1)
heimdal_includedirs = []
heimdal_libdirs = []
diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
index 0f7e404c1a..1ad6d207db 100644
--- a/wscript_configure_system_mitkrb5
+++ b/wscript_configure_system_mitkrb5
@@ -60,8 +60,9 @@ if conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi gssapi_krb5'):
have_gssapi=True
if not have_gssapi:
- Logs.error("ERROR: WAF build with MIT Krb5 requires working GSSAPI implementation")
- sys.exit(1)
+ if conf.env.KRB5_CONFIG and conf.env.KRB5_CONFIG != 'heimdal':
+ Logs.error("ERROR: WAF build with MIT Krb5 requires working GSSAPI implementation")
+ sys.exit(1)
conf.CHECK_FUNCS_IN('''
gss_wrap_iov
@@ -96,7 +97,7 @@ conf.CHECK_FUNCS('''
krb5_get_init_creds_keyblock krb5_get_init_creds_keytab
krb5_make_principal krb5_build_principal_alloc_va
krb5_cc_get_lifetime krb5_cc_retrieve_cred
- krb5_free_checksum_contents krb5_c_make_checksum''',
+ krb5_free_checksum_contents krb5_c_make_checksum krb5_create_checksum''',
lib='krb5 k5crypto')
conf.CHECK_DECLS('''krb5_get_credentials_for_user
krb5_auth_con_set_req_cksumtype''',
@@ -240,3 +241,11 @@ conf.CHECK_CODE('''#define KRB5_DEPRECATED 1
'HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER', addmain=False,
link=False,
msg="Checking for KRB5_DEPRECATED define taking an identifier")
+
+conf.CHECK_CODE('''
+ krb5_creds creds;
+ creds.flags.b.initial = 0;
+ ''',
+ 'HAVE_FLAGS_IN_KRB5_CREDS',
+ headers='krb5.h', lib='krb5', execute=False,
+ msg="Checking whether krb5_creds have flags property")