summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-12-01 21:26:29 +0100
committerGünther Deschner <gd@samba.org>2010-12-03 13:07:45 +0100
commit5676acbb73270edb7ef6d7e0e64c2bc35b4ffd45 (patch)
tree4556b5222216d5fabf7e21227a5eab9b7455115f /source3
parent88ff7e3c5ca69a331aa96e0db389cf3e14b1279c (diff)
downloadsamba-5676acbb73270edb7ef6d7e0e64c2bc35b4ffd45.tar.gz
samba-5676acbb73270edb7ef6d7e0e64c2bc35b4ffd45.tar.bz2
samba-5676acbb73270edb7ef6d7e0e64c2bc35b4ffd45.zip
s3-waf: more krb5 configure checks.
Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/wscript13
1 files changed, 11 insertions, 2 deletions
diff --git a/source3/wscript b/source3/wscript
index 709651fa7f..c447e750f0 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -570,12 +570,21 @@ krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''',
define='HAVE_KRB5_KEYBLOCK_IN_CREDS')
conf.CHECK_STRUCTURE_MEMBER('krb5_creds', 'session', headers='krb5.h',
define='HAVE_KRB5_SESSION_IN_CREDS')
- if conf.CHECK_STRUCTURE_MEMBER('krb5_ticket', 'enc_part.enctype', headers='krb5.h') and conf.CHECK_STRUCTURE_MEMBER('krb5_ticket', 'enc_part.kvno', headers='krb5.h'):
- conf.DEFINE('KRB5_TICKET_HAS_KEYINFO', '1')
conf.CHECK_STRUCTURE_MEMBER('krb5_ap_req', 'ticket', headers='krb5.h',
define='HAVE_TICKET_POINTER_IN_KRB5_AP_REQ')
conf.CHECK_TYPE('krb5_encrypt_block', headers='krb5.h')
+
+ conf.CHECK_CODE('''
+krb5_ticket ticket;
+krb5_kvno kvno;
+krb5_enctype enctype;
+enctype = ticket.enc_part.enctype;
+kvno = ticket.enc_part.kvno;
+''',
+ 'KRB5_TICKET_HAS_KEYINFO',
+ headers='krb5.h', link=False,
+ msg="Checking whether the krb5_ticket structure contains the kvno and enctype")
conf.CHECK_CODE('''
krb5_context ctx;
krb5_get_init_creds_opt *opt = NULL;