From 569ac95e062bd1ef67355b170f65f088ec56be21 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Thu, 31 Jan 2013 21:55:19 +0000
Subject: handle krb5_trace_callback's signature changing

---
diff --git a/configure.ac b/configure.ac
index a6847e5..49c752c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,6 +162,7 @@ if test x$ac_cv_header_krb5_h = xyes ; then
 else
 	AC_DEFINE(KRB5_H,[<krb5/krb5.h>],[Define to the name of your Kerberos 5 header.])
 fi
+AC_CHECK_TYPES([struct krb5_trace_info,struct _krb5_trace_info],,,[#include KRB5_H])
 
 LIBSsave="$LIBS"
 LIBS="$LIBS $KRB5_LIBS"
diff --git a/src/log.h b/src/log.h
index 0231073..5e2af10 100644
--- a/src/log.h
+++ b/src/log.h
@@ -41,7 +41,11 @@ void notice(const char *fmt, ...) PAM_KRB5_GNUC_PRINTF (1, 2);
 void crit(const char *fmt, ...) PAM_KRB5_GNUC_PRINTF (1, 2);
 void notice_user(struct pam_handle *pamh, const char *fmt, ...) PAM_KRB5_GNUC_PRINTF (2, 3);
 #ifdef HAVE_KRB5_SET_TRACE_CALLBACK
+#if defined(HAVE_STRUCT__KRB5_TRACE_INFO)
+void trace(krb5_context ctx, const struct _krb5_trace_info *info, void *data);
+#elif defined(HAVE_STRUCT_KRB5_TRACE_INFO)
 void trace(krb5_context ctx, const struct krb5_trace_info *info, void *data);
 #endif
+#endif
 
 #endif
diff --git a/src/logpam.c b/src/logpam.c
index 785ea5e..c4840e4 100644
--- a/src/logpam.c
+++ b/src/logpam.c
@@ -101,7 +101,11 @@ debug(const char *fmt, ...)
 
 #ifdef HAVE_KRB5_SET_TRACE_CALLBACK
 void
+#if defined(HAVE_STRUCT__KRB5_TRACE_INFO)
+trace(krb5_context ctx, const struct _krb5_trace_info *info, void *data)
+#elif defined(HAVE_STRUCT_KRB5_TRACE_INFO)
 trace(krb5_context ctx, const struct krb5_trace_info *info, void *data)
+#endif
 {
 	int len;
 	if (info != NULL) {
diff --git a/src/logstdio.c b/src/logstdio.c
index 98725c3..8297db3 100644
--- a/src/logstdio.c
+++ b/src/logstdio.c
@@ -92,7 +92,11 @@ debug(const char *fmt, ...)
 
 #ifdef HAVE_KRB5_SET_TRACE_CALLBACK
 void
+#if defined(HAVE_STRUCT__KRB5_TRACE_INFO)
+trace(krb5_context ctx, const struct _krb5_trace_info *info, void *data)
+#elif defined(HAVE_STRUCT_KRB5_TRACE_INFO)
 trace(krb5_context ctx, const struct krb5_trace_info *info, void *data)
+#endif
 {
 	int len;
 	if (info != NULL) {
--
cgit v0.9.1