sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

krb5-wrap: deal with different krb5_trace_info struct flavors (earlier MIT krb5 releases)

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14252

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Jan 24 20:38:53 UTC 2020 on sn-devel-184
This commit is contained in:
Günther Deschner 2020-01-23 15:31:27 +01:00 committed by Andreas Schneider
parent 91b68ac0b6
commit b2c13d9a16
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/krb5_wrap/krb5_samba.c
View File

@ -3528,7 +3528,13 @@ failed:
#ifndef SAMBA4_USES_HEIMDAL /* MITKRB5 tracing callback */
static void smb_krb5_trace_cb(krb5_context ctx,
#ifdef HAVE_KRB5_TRACE_INFO
const krb5_trace_info *info,
#elif defined(HAVE_KRB5_TRACE_INFO_STRUCT)
const struct krb5_trace_info *info,
#else
#error unknown krb5_trace_info
#endif
void *data)
{
if (info != NULL) {

3
wscript_configure_system_mitkrb5
View File

@ -171,7 +171,8 @@ conf.CHECK_STRUCTURE_MEMBER('krb5_ap_req', 'ticket', headers='krb5.h',
define='HAVE_TICKET_POINTER_IN_KRB5_AP_REQ')
conf.CHECK_STRUCTURE_MEMBER('krb5_prompt', 'type', headers='krb5.h',
define='HAVE_KRB5_PROMPT_TYPE')
conf.CHECK_CODE('krb5_trace_info', 'HAVE_KRB5_TRACE_INFO', headers='krb5.h')
conf.CHECK_CODE('struct krb5_trace_info', 'HAVE_KRB5_TRACE_INFO_STRUCT', headers='krb5.h')
conf.CHECK_TYPE('krb5_encrypt_block', headers='krb5.h')
conf.CHECK_CODE('''