summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2013-02-04 11:30:48 -0500
committerJakub Hrozek <jhrozek@redhat.com>2013-02-11 15:42:17 +0100
commit4e78fab6a1b2e9653a7959cbdb7d54bb750041d0 (patch)
tree31a30bd8bde535fafb0d4b072fdc750e721b74e4
parent4f118e3e6a25762f40a43e6dbefb09f44adbef32 (diff)
downloadsssd-4e78fab6a1b2e9653a7959cbdb7d54bb750041d0.tar.gz
sssd-4e78fab6a1b2e9653a7959cbdb7d54bb750041d0.tar.bz2
sssd-4e78fab6a1b2e9653a7959cbdb7d54bb750041d0.zip
krb5: include backwards compatible declaration of krb5_trace_info
krb5-1.10 used to include "struct krb5_trace_info", now krb5-1.11 includes a "krb5_trace_info" typedefed from "struct _krb5_trace_info". Do the same in the SSSD to allow compiling with both 1.10 and 1.11.
-rw-r--r--src/external/krb5.m42
-rw-r--r--src/util/sss_krb5.c8
2 files changed, 8 insertions, 2 deletions
diff --git a/src/external/krb5.m4 b/src/external/krb5.m4
index 5bc87112..f1679a15 100644
--- a/src/external/krb5.m4
+++ b/src/external/krb5.m4
@@ -37,7 +37,7 @@ SAVE_LIBS=$LIBS
CFLAGS="$CFLAGS $KRB5_CFLAGS"
LIBS="$LIBS $KRB5_LIBS"
AC_CHECK_HEADERS([krb5.h krb5/krb5.h])
-AC_CHECK_TYPES([krb5_ticket_times, krb5_times], [], [],
+AC_CHECK_TYPES([krb5_ticket_times, krb5_times, krb5_trace_info], [], [],
[ #ifdef HAVE_KRB5_KRB5_H
#include <krb5/krb5.h>
#else
diff --git a/src/util/sss_krb5.c b/src/util/sss_krb5.c
index bb61d109..ab0344c8 100644
--- a/src/util/sss_krb5.c
+++ b/src/util/sss_krb5.c
@@ -1001,9 +1001,15 @@ sss_krb5_residual_check_type(const char *full_location,
}
#ifdef HAVE_KRB5_SET_TRACE_CALLBACK
+
+#ifndef HAVE_KRB5_TRACE_INFO
+/* krb5-1.10 had struct krb5_trace_info, 1.11 has type named krb5_trace_info */
+typedef struct krb5_trace_info krb5_trace_info;
+#endif /* HAVE_KRB5_TRACE_INFO */
+
static void
sss_child_krb5_trace_cb(krb5_context context,
- const struct krb5_trace_info *info, void *data)
+ const krb5_trace_info *info, void *data)
{
if (info == NULL) {
/* Null info means destroy the callback data. */