]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
macos: krb5_524 is uselessly stubbed
authorDerrick Brashear <shadow@dementia.org>
Fri, 22 Jul 2011 00:30:00 +0000 (20:30 -0400)
committerDerrick Brashear <shadow@dementia.org>
Fri, 22 Jul 2011 23:40:39 +0000 (16:40 -0700)
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 <jaltman@openafs.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit ee950e7ecf578bd225eec29b182f108450c5bfaf)

Change-Id: Idc2fa790d97b75971c29eec98bb96e799356dc4a
Reviewed-on: http://gerrit.openafs.org/5070
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
src/aklog/aklog.c

index 121e3f426700880408056c0b079726dfc67e630f..75b4629e0bc2ba6bcce51d59578a9027e1905bf1 100644 (file)
@@ -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