From: Derrick Brashear Date: Fri, 22 Jul 2011 00:30:00 +0000 (-0400) Subject: macos: krb5_524 is uselessly stubbed X-Git-Tag: upstream/1.6.0^2~80 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=bc8b5d430cd8fea7d7aad9af1f3e7958f372bfce;p=packages%2Fo%2Fopenafs.git macos: krb5_524 is uselessly stubbed from MITKerberosShim-44: dummy(krb5_524_conv_principal, 0); dummy(krb5_524_convert_creds, 0); this basically logs and returns success. not helpful. so let's just not call them. Reviewed-on: http://gerrit.openafs.org/5066 Reviewed-by: Jeffrey Altman Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear (cherry picked from commit ee950e7ecf578bd225eec29b182f108450c5bfaf) Change-Id: Idc2fa790d97b75971c29eec98bb96e799356dc4a Reviewed-on: http://gerrit.openafs.org/5070 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/src/aklog/aklog.c b/src/aklog/aklog.c index 121e3f426..75b4629e0 100644 --- a/src/aklog/aklog.c +++ b/src/aklog/aklog.c @@ -242,7 +242,9 @@ Done: #error "Must have either keyblock or session member of krb5_creds" #endif -#if !defined(HAVE_KRB5_524_CONVERT_CREDS) && defined(HAVE_KRB524_CONVERT_CREDS_KDC) +#ifdef AFS_DARWIN110_ENV +#define HAVE_NO_KRB5_524 /* MITKerberosShim logs but returns success */ +#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