From 36426f4569d1c8ea9f6828e3b93d6df3745fbbbf Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Thu, 28 Mar 2013 16:42:58 -0500 Subject: [PATCH] aklog: Probe for libasn1 on heimdal MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit aklog uses encode_EncTicketPart and some other encode_* ASN.1 routines when we're building against heimdal. Our krb5 autoconf logic from c-rra-util is not guaranteed to include libasn1 in KRB5_LIBS, since it's not required for functions in the krb5 API. So, specifically test for it. Related issue reported by MÃ¥ns Nilsson. Reviewed-on: http://gerrit.openafs.org/9693 Tested-by: BuildBot Reviewed-by: Russ Allbery Reviewed-by: Andrew Deason Reviewed-by: Derrick Brashear (cherry picked from commit 1942d2a4fc90703e64e1c97ba10d2918ba584e73) Change-Id: Ibf3713ff5027ec3b410e4b19ffd11f5449357248 Reviewed-on: http://gerrit.openafs.org/9917 Reviewed-by: Andrew Deason Tested-by: BuildBot Reviewed-by: Stephan Wiesand --- configure.ac | 8 ++++++++ src/aklog/Makefile.in | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index da1ff5e03..38ac6f256 100644 --- a/configure.ac +++ b/configure.ac @@ -87,11 +87,19 @@ AS_IF([test x"$KRB5_LIBS" != x], krb5_keytab_entry.keyblock, krb5_keyblock.enctype, krb5_keyblock.keytype, krb5_prompt.type], , , [#include ]) +dnl If we have krb5_creds.session, we are using heimdal +dnl If we're using heimdal, aklog needs libasn1 for encode_EncTicketPart and a +dnl few other functions. But just aklog; not any of the other stuff that uses +dnl krb5. + AS_IF([test x"$ac_cv_member_krb5_creds_session" = xyes], + [AC_CHECK_LIB([asn1], [encode_EncTicketPart], + [AKLOG_KRB5_LIBS="-lasn1"])]) AC_CHECK_DECLS([krb5_free_keytab_entry_contents, krb5_kt_free_entry, KRB5_KU_TICKET], [], [], [#include ]) RRA_LIB_KRB5_RESTORE]) AC_SUBST([BUILD_KRB5]) AC_SUBST([MAKE_KRB5]) +AC_SUBST([AKLOG_KRB5_LIBS]) if test -d 'doc/man-pages' ; then MAN_MAKEFILE="doc/man-pages/Makefile doc/man-pages/install-man" diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in index 68bb4d88b..4feecb482 100644 --- a/src/aklog/Makefile.in +++ b/src/aklog/Makefile.in @@ -10,7 +10,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ XCFLAGS=@XCFLAGS@ @KRB5_CPPFLAGS@ -DALLOW_REGISTER -AKLIBS = ${LIBS} @KRB5_LDFLAGS@ @KRB5_LIBS@ +AKLIBS = ${LIBS} @KRB5_LDFLAGS@ @KRB5_LIBS@ @AKLOG_KRB5_LIBS@ AFSLIBS = ${TOP_LIBDIR}/libprot.a ${TOP_LIBDIR}/libauth.a \ ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/librxkad.a \ ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/librx.a \ -- 2.39.5