From: Derrick Brashear Date: Tue, 12 Jun 2012 17:46:46 +0000 (-0400) Subject: aklog: can't assume krb5_524_conv_principal based on convert_creds X-Git-Tag: upstream/1.6.2_pre2^2~163 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=14d02a1e80868e3c1b96ab771ead2ecca1351a39;p=packages%2Fo%2Fopenafs.git aklog: can't assume krb5_524_conv_principal based on convert_creds add probing for krb5_524_conv_principal directly instead of assuming finding a 524 library will find it. current heimdal does not include it. Reviewed-on: http://gerrit.openafs.org/7551 Tested-by: BuildBot Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear (cherry picked from commit 6d3390bc16281e6f889bb555abb1182985556287) Change-Id: Icc576d1a711fa771fda393c61a15082ffb94defc Reviewed-on: http://gerrit.openafs.org/7582 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/configure.ac b/configure.ac index cf5d625da..d028fa17a 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,7 @@ AS_IF([test x"$KRB5_LIBS" != x], add_to_error_table \ encode_krb5_enc_tkt_part \ encode_krb5_ticket \ + krb5_524_conv_principal \ krb5_allow_weak_crypto \ krb5_c_encrypt \ krb5_decode_ticket \ @@ -68,6 +69,9 @@ AS_IF([test x"$KRB5_LIBS" != x], [AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc], [LIBS="-lkrb524 $LIBS" KRB5_LIBS="-lkrb524 $KRB5_LIBS" + AC_CHECK_LIB([krb524], [krb5_524_conv_principal], + [AC_DEFINE([HAVE_KRB5_524_CONV_PRINCIPAL], 1, + [Define to 1 if you have the `krb5_524_conv_principal' function.])]) AC_DEFINE([HAVE_KRB524_CONVERT_CREDS_KDC], 1, [Define to 1 if you have the `krb524_convert_creds_kdc' function.])])])]) AC_CHECK_HEADERS([kerberosIV/krb.h]) diff --git a/src/aklog/aklog.c b/src/aklog/aklog.c index 2104bc58b..cce3c4451 100644 --- a/src/aklog/aklog.c +++ b/src/aklog/aklog.c @@ -242,12 +242,11 @@ Done: #error "Must have either keyblock or session member of krb5_creds" #endif -#ifdef AFS_DARWIN110_ENV -#define HAVE_NO_KRB5_524 /* MITKerberosShim logs but returns success */ +/* MITKerberosShim logs but returns success */ +#if !defined(HAVE_KRB5_524_CONV_PRINCIPAL) || defined(AFS_DARWIN110_ENV) || (!defined(HAVE_KRB5_524_CONVERT_CREDS) && !defined(HAVE_KRB524_CONVERT_CREDS_KDC)) +#define HAVE_NO_KRB5_524 #elif !defined(HAVE_KRB5_524_CONVERT_CREDS) && defined(HAVE_KRB524_CONVERT_CREDS_KDC) #define krb5_524_convert_creds krb524_convert_creds_kdc -#elif !defined(HAVE_KRB5_524_CONVERT_CREDS) && !defined(HAVE_KRB524_CONVERT_CREDS_KDC) -#define HAVE_NO_KRB5_524 #endif #if USING_HEIMDAL