>From 2fe81f6027df7ae632952b4e622248cdddf1c470 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Fri, 12 Oct 2012 18:19:06 +0200 Subject: [PATCH] Only call krb5_set_trace_callback on platforms that support it --- src/external/krb5.m4 | 1 + src/providers/krb5/krb5_child.c | 2 ++ src/providers/ldap/ldap_child.c | 2 ++ src/util/sss_krb5.c | 2 ++ src/util/sss_krb5.h | 2 ++ 5 files changed, 9 insertions(+) diff --git a/src/external/krb5.m4 b/src/external/krb5.m4 index 474cb37cb44cd75fc606ed54833fe0a57b5acc6b..cb420aaed1b64ec19160c6700c664ec57e1efa8d 100644 --- a/src/external/krb5.m4 +++ b/src/external/krb5.m4 @@ -59,6 +59,7 @@ AC_CHECK_FUNCS([krb5_get_init_creds_opt_alloc krb5_get_error_message \ krb5_principal_get_realm \ krb5_cc_cache_match \ krb5_timestamp_to_sfstring \ + krb5_set_trace_callback \ krb5_cc_get_full_name]) CFLAGS=$SAVE_CFLAGS LIBS=$SAVE_LIBS diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c index cd826add0c34fc798541798bd3e544a317658729..3e9e2fe3df644e4895b03621185b0c341f2bdc52 100644 --- a/src/providers/krb5/krb5_child.c +++ b/src/providers/krb5/krb5_child.c @@ -1624,6 +1624,7 @@ set_child_debugging(krb5_context ctx) /* Set the global error context */ krb5_error_ctx = ctx; +#ifdef HAVE_KRB5_SET_TRACE_CALLBACK if (debug_level & SSSDBG_TRACE_ALL) { kerr = krb5_set_trace_callback(ctx, sss_child_krb5_trace_cb, NULL); if (kerr) { @@ -1631,6 +1632,7 @@ set_child_debugging(krb5_context ctx) return EIO; } } +#endif return EOK; } diff --git a/src/providers/ldap/ldap_child.c b/src/providers/ldap/ldap_child.c index de25fc073a674df02435987d50681b38db79ca20..6bfaa4ea5abc84304c5a677a00c6a4bbe962612a 100644 --- a/src/providers/ldap/ldap_child.c +++ b/src/providers/ldap/ldap_child.c @@ -149,6 +149,7 @@ set_child_debugging(krb5_context ctx) /* Set the global error context */ krb5_error_ctx = ctx; +#ifdef HAVE_KRB5_SET_TRACE_CALLBACK if (debug_level & SSSDBG_TRACE_ALL) { kerr = krb5_set_trace_callback(ctx, sss_child_krb5_trace_cb, NULL); if (kerr) { @@ -156,6 +157,7 @@ set_child_debugging(krb5_context ctx) return EIO; } } +#endif return EOK; } diff --git a/src/util/sss_krb5.c b/src/util/sss_krb5.c index 0a80f23a8017a0aed245ca6a376a3d1fe6c8ca87..0e83bcd1f61b8fc22ea5e596694ae27b59609289 100644 --- a/src/util/sss_krb5.c +++ b/src/util/sss_krb5.c @@ -964,6 +964,7 @@ sss_krb5_residual_check_type(const char *full_location, return sss_krb5_residual_by_type(full_location, type); } +#ifdef HAVE_KRB5_SET_TRACE_CALLBACK void sss_child_krb5_trace_cb(krb5_context context, const struct krb5_trace_info *info, void *data) @@ -975,3 +976,4 @@ sss_child_krb5_trace_cb(krb5_context context, DEBUG(SSSDBG_TRACE_ALL, ("%s\n", info->message)); } +#endif diff --git a/src/util/sss_krb5.h b/src/util/sss_krb5.h index 708914c6c532ea9865b59e5eca1d224bc09d622e..05566f6c290b152b554e5bff83d87e69da3decec 100644 --- a/src/util/sss_krb5.h +++ b/src/util/sss_krb5.h @@ -167,8 +167,10 @@ typedef krb5_ticket_times sss_krb5_ticket_times; typedef krb5_times sss_krb5_ticket_times; #endif +#ifdef HAVE_KRB5_SET_TRACE_CALLBACK void sss_child_krb5_trace_cb(krb5_context context, const struct krb5_trace_info *info, void *data); +#endif /* HAVE_KRB5_SET_TRACE_CALLBACK */ #endif /* __SSS_KRB5_H__ */ -- 1.7.11.4