summaryrefslogtreecommitdiff
path: root/wscript_configure_system_mitkrb5
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 /wscript_configure_system_mitkrb5
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
Diffstat (limited to 'wscript_configure_system_mitkrb5')
-rw-r--r--wscript_configure_system_mitkrb515
1 files changed, 12 insertions, 3 deletions
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")