krb5-wrap: deal with different krb5_trace_info struct flavors (earlie…

…r MIT krb5 releases) BUG: https://bugzilla.samba.org/show_bug.cgi?id=14252 Guenther Signed-off-by: Guenther Deschner <[email protected]> Reviewed-by: Andreas Schneider <[email protected]> Autobuild-User(master): Andreas Schneider <[email protected]> Autobuild-Date(master): Fri Jan 24 20:38:53 UTC 2020 on sn-devel-184
httpstorm · Jan 24, 2020 · b2c13d9 · b2c13d9
1 parent 91b68ac
commit b2c13d9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
@@ -3528,7 +3528,13 @@ int ads_krb5_cli_get_ticket(TALLOC_CTX *mem_ctx,
 
 #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) {

diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
@@ -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('''