pull up r18250 from trunk

 r18250@cathode-dark-space:  jaltman | 2006-06-28 19:00:09 -0400
 ticket: 3940
 tags: pullup

 	cc_mslsa.c:  The WOW64 environment on 64-bit versions of
   	Windows prior to Vista Beta 2 did not implement the Lsa
 	functions used by the MSLSA: ccache.   This patch disables
 	the MSLSA: ccache in broken WOW64 environments by checking
 	the Windows version and the existence and response of the
 	IsWow64Process API.

ticket: 3940

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

diff --git a/src/lib/krb5/ccache/cc_mslsa.c b/src/lib/krb5/ccache/cc_mslsa.c
index f31788a6251bf081e5ba3c76e90ab0fd9e0b784c..d9ebbec19f13a8de1c170225fcf8a2ce15306751 100644 (file)
--- a/src/lib/krb5/ccache/cc_mslsa.c
+++ b/src/lib/krb5/ccache/cc_mslsa.c
@@ -127,6 +127,43 @@ is_windows_xp (void)
    return fIsWinXP;
 }
 
+typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL);
+
+static BOOL
+is_broken_wow64(void)
+{
+    static BOOL fChecked = FALSE;
+    static BOOL fIsBrokenWow64 = FALSE;
+
+    if (!fChecked)
+    {
+       BOOL isWow64 = FALSE;
+       OSVERSIONINFO Version;
+       LPFN_ISWOW64PROCESS fnIsWow64Process = 
+           (LPFN_ISWOW64PROCESS)GetProcAddress(GetModuleHandle("kernel32"),
+                                               "IsWow64Process");
+
+       /* If we don't find the fnIsWow64Process function then we 
+        * are not running in a broken Wow64 
+        */
+       if (fnIsWow64Process) {
+           memset (&Version, 0x00, sizeof(Version));
+           Version.dwOSVersionInfoSize = sizeof(Version);
+
+           if (fnIsWow64Process(GetCurrentProcess(), &isWow64) && 
+               GetVersionEx (&Version)) {
+               if (isWow64 && 
+                   Version.dwPlatformId == VER_PLATFORM_WIN32_NT &&
+                   Version.dwMajorVersion < 6)
+                   fIsBrokenWow64 = TRUE;
+           } 
+       }
+       fChecked = TRUE;
+    }
+
+    return fIsBrokenWow64;
+}
+
 /* This flag is only supported by versions of Windows which have obtained
  * a code change from Microsoft.   When the code change is installed,
  * setting this flag will cause all retrieved credentials to be stored 
@@ -626,9 +663,9 @@ IsKerberosLogon(VOID)
             usLength = (pSessionData->AuthenticationPackage).Length;
             if (usLength < 256)
             {
-                lstrcpyn (buffer, usBuffer, usLength);
-                lstrcat (buffer,L"");
-                if ( !lstrcmp(L"Kerberos",buffer) )
+                lstrcpynW (buffer, usBuffer, usLength);
+                lstrcatW (buffer,L"");
+                if ( !lstrcmpW(L"Kerberos",buffer) )
                     Success = TRUE;
             }
         }
@@ -1566,7 +1603,7 @@ krb5_lcc_resolve (krb5_context context, krb5_ccache *id, const char *residual)
     KERB_EXTERNAL_TICKET *msticket;
     krb5_error_code retval = KRB5_OK;
 
-    if (!is_windows_2000())
+    if (!is_windows_2000() || is_broken_wow64())
         return KRB5_FCC_NOFILE;
 
     if (!PackageConnectLookup(&LogonHandle, &PackageId))