From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 5 Sep 2007 22:48:06 +0000 (+0000)
Subject: 64-bit Windows krb5int_cc_default calls to Leash
X-Git-Tag: krb5-1.7-alpha1~883
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4182dad8cdb97b033d4e97a7a213e65a8ca04088;p=krb5.git

64-bit Windows krb5int_cc_default calls to Leash

AMD64 builds must load leashw64.dll not leashw32.dll

ticket:new

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19929 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/ccache/ccdefault.c b/src/lib/krb5/ccache/ccdefault.c
index f256bfd08..b7a592f74 100644
--- a/src/lib/krb5/ccache/ccdefault.c
+++ b/src/lib/krb5/ccache/ccdefault.c
@@ -34,6 +34,11 @@
 #elif defined(USE_LEASH)
 static void (*pLeash_AcquireInitialTicketsIfNeeded)(krb5_context,krb5_principal,char*,int) = NULL;
 static HANDLE hLeashDLL = INVALID_HANDLE_VALUE;
+#ifdef _WIN64
+#define LEASH_DLL "leashw64.dll"
+#else
+#define LEASH_DLL "leashw32.dll"
+#endif
 #endif
 
 
@@ -86,7 +91,7 @@ krb5int_cc_default(krb5_context context, krb5_ccache *ccache)
 #else
 #ifdef USE_LEASH
     if ( hLeashDLL == INVALID_HANDLE_VALUE ) {
-        hLeashDLL = LoadLibrary("leashw32.dll");
+        hLeashDLL = LoadLibrary(LEASH_DLL);
         if ( hLeashDLL != INVALID_HANDLE_VALUE ) {
             (FARPROC) pLeash_AcquireInitialTicketsIfNeeded =
             GetProcAddress(hLeashDLL, "not_an_API_Leash_AcquireInitialTicketsIfNeeded");