pull up r19909 from trunk
authorTom Yu <tlyu@mit.edu>
Sat, 29 Sep 2007 00:02:57 +0000 (00:02 +0000)
committerTom Yu <tlyu@mit.edu>
Sat, 29 Sep 2007 00:02:57 +0000 (00:02 +0000)
 r19909@cathode-dark-space:  jaltman | 2007-09-02 10:12:13 -0400
 ticket: new
 subject: GSS-API Win64 support

 The name of the Leash API DLL on Win64 is "leashw64.dll".

ticket: 5705
version_fixed: 1.6.3

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@20010 dc483132-0cff-0310-8789-dd5450dbe970

src/lib/gssapi/krb5/acquire_cred.c

index 3f213a12eefec23f1cfda58d8eb05ac6687632ea..169889ee3a75501cce2cfd3a256992940761f16c 100644 (file)
 #if defined(USE_LOGIN_LIBRARY)
 #include <Kerberos/KerberosLoginPrivate.h>
 #elif defined(USE_LEASH)
+#ifdef _WIN64
+#define LEASH_DLL "leashw64.dll"
+#else
+#define LEASH_DLL "leashw32.dll"
+#endif
 static void (*pLeash_AcquireInitialTicketsIfNeeded)(krb5_context,krb5_principal,char*,int) = NULL;
 static HANDLE hLeashDLL = INVALID_HANDLE_VALUE;
 #endif
@@ -265,7 +270,7 @@ acquire_init_cred(context, minor_status, desired_name, output_princ, cred)
        
 #elif defined(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");