diff options
| author |   Maxim Koltsov <maksbotan@gentoo.org> | 2013-04-05 17:46:25 +0000 |
|---|---|---|
| committer | Maxim Koltsov <maksbotan@gentoo.org> | 2013-04-05 17:46:25 +0000 |
| commit | dc322dc8964f0f1a1cae073a4dfb970bb973307d (patch) | |
| tree | 503dbc6f29a5b315d0379af7298cc0c6e07b0180 /sys-auth | |
| parent | Stable for ppc, wrt bug #464366 (diff) | |
| download | gentoo-2-dc322dc8964f0f1a1cae073a4dfb970bb973307d.tar.gz gentoo-2-dc322dc8964f0f1a1cae073a4dfb970bb973307d.tar.bz2 gentoo-2-dc322dc8964f0f1a1cae073a4dfb970bb973307d.zip | |
Fix build with mit-krb5-1.11.1, bug #463812. Thanks to slepnoga and Andrian Nord.
(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)
Diffstat (limited to 'sys-auth')
| -rw-r--r-- | sys-auth/sssd/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-auth/sssd/files/new_krb5.patch | 46 |
2 files changed, 51 insertions, 1 deletions
diff --git a/sys-auth/sssd/ChangeLog b/sys-auth/sssd/ChangeLog index ecb0bd04f8ad..1cd97ddbeb31 100644 --- a/sys-auth/sssd/ChangeLog +++ b/sys-auth/sssd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-auth/sssd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.38 2013/04/05 07:16:20 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/ChangeLog,v 1.39 2013/04/05 17:46:25 maksbotan Exp $ + + 05 Apr 2013; Maxim Koltsov <maksbotan@gentoo.org> +files/new_krb5.patch: + Fix build with mit-krb5-1.11.1, bug #463812. Thanks to slepnoga and Andrian + Nord. *sssd-1.9.4-r2 (05 Apr 2013) *sssd-1.8.6-r1 (05 Apr 2013) diff --git a/sys-auth/sssd/files/new_krb5.patch b/sys-auth/sssd/files/new_krb5.patch new file mode 100644 index 000000000000..03a7c744f2ae --- /dev/null +++ b/sys-auth/sssd/files/new_krb5.patch @@ -0,0 +1,46 @@ +From 4e78fab6a1b2e9653a7959cbdb7d54bb750041d0 Mon Sep 17 00:00:00 2001 +From: Jakub Hrozek <jhrozek@redhat.com> +Date: Mon, 04 Feb 2013 16:30:48 +0000 +Subject: 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. +--- +diff --git a/src/external/krb5.m4 b/src/external/krb5.m4 +index 5bc8711..f1679a1 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 bb61d10..ab0344c 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. */ +-- +cgit v0.9.1 |