[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  b2c13d9a162 krb5-wrap: deal with different krb5_trace_info struct flavors (earlier MIT krb5 releases)
      from  91b68ac0b6f nsswitch:tests: Add test to check correct group lookup with samlogon cache

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b2c13d9a1624b71229ab334ece82fef152afe2eb
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jan 23 15:31:27 2020 +0100

    krb5-wrap: deal with different krb5_trace_info struct flavors (earlier MIT krb5 releases)
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14252
    
    Guenther
    
    Signed-off-by: Guenther Deschner <gd at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Fri Jan 24 20:38:53 UTC 2020 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 lib/krb5_wrap/krb5_samba.c       | 6 ++++++
 wscript_configure_system_mitkrb5 | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index ee7055ea7b8..20ce86c708d 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -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) {
diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
index b05ac3f3e50..b14881f094c 100644
--- 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('''


-- 
Samba Shared Repository