[26226] in CVS-changelog-for-Kerberos-V5
svn rev #25566: trunk/src/windows/
daemon@ATHENA.MIT.EDU (tlyu@mit.edu)
Mon Dec 12 15:46:12 2011
Date: Mon, 12 Dec 2011 15:46:10 -0500
From: tlyu@mit.edu
Message-Id: <201112122046.pBCKkABR005774@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
http://src.mit.edu/fisheye/changelog/krb5/?cs=25566
Commit By: tlyu
Log Message:
ticket: 7050
subject: kfw: fix 'K5_ORIGINAL_NAME' for 64 bit dlls.
..still need to actually to define _WIN64 for rc.exe though
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
Changed Files:
U trunk/src/windows/version.rc
Modified: trunk/src/windows/version.rc
===================================================================
--- trunk/src/windows/version.rc 2011-12-12 20:46:07 UTC (rev 25565)
+++ trunk/src/windows/version.rc 2011-12-12 20:46:10 UTC (rev 25566)
@@ -57,8 +57,8 @@
#define K5_DESCRIPTION "Kerberos v5 support - internal support code for " KRB5_PRODUCTNAME_STR
#define K5_INTERNAL_NAME "krb5support\0"
#define K5_FILETYPE VFT_DLL
-#if !defined(_WIN32)
-#error not win32??
+#if defined(_WIN64)
+#define K5_ORIGINAL_NAME "k5sprt64.dll\0"
#else
#define K5_ORIGINAL_NAME "k5sprt32.dll\0"
#endif
@@ -68,8 +68,8 @@
#define K5_DESCRIPTION "COM_ERR - Common Error Handler for " KRB5_PRODUCTNAME_STR "\0"
#define K5_INTERNAL_NAME "comerr\0"
#define K5_FILETYPE VFT_DLL
-#if !defined(_WIN32)
-#define K5_ORIGINAL_NAME "comerr16.dll\0"
+#if defined(_WIN64)
+#define K5_ORIGINAL_NAME "comerr64.dll\0"
#else
#define K5_ORIGINAL_NAME "comerr32.dll\0"
#endif
@@ -79,8 +79,8 @@
#define K5_DESCRIPTION "PROFILE - Profile Library " KRB5_PRODUCTNAME_STR "\0"
#define K5_INTERNAL_NAME "profile\0"
#define K5_FILETYPE VFT_DLL
-#if !defined(_WIN32)
-#define K5_ORIGINAL_NAME "xpprof16.dll\0"
+#if defined(_WIN64)
+#define K5_ORIGINAL_NAME "xpprof64.dll\0"
#else
#define K5_ORIGINAL_NAME "xpprof32.dll\0"
#endif
@@ -90,8 +90,8 @@
#define K5_DESCRIPTION "Kerberos v5 - " KRB5_PRODUCTNAME_STR "\0"
#define K5_INTERNAL_NAME "krb5\0"
#define K5_FILETYPE VFT_DLL
-#if !defined(_WIN32)
-#define K5_ORIGINAL_NAME "krb5_16.dll\0"
+#if defined(_WIN64)
+#define K5_ORIGINAL_NAME "krb5_64.dll\0"
#else
#define K5_ORIGINAL_NAME "krb5_32.dll\0"
#endif
@@ -101,8 +101,8 @@
#define K5_DESCRIPTION "GSSAPI - GSS API implementation for Kerberos 5 mechanism\0"
#define K5_INTERNAL_NAME "gssapi\0"
#define K5_FILETYPE VFT_DLL
-#if !defined(_WIN32)
-#define K5_ORIGINAL_NAME "gssapi.dll\0"
+#if defined(_WIN64)
+#define K5_ORIGINAL_NAME "gssapi64.dll\0"
#else
#define K5_ORIGINAL_NAME "gssapi32.dll\0"
#endif
@@ -119,8 +119,8 @@
#define K5_DESCRIPTION "Leash Helper API - " KRB5_PRODUCTNAME_STR "\0"
#define K5_INTERNAL_NAME "leashw\0"
#define K5_FILETYPE VFT_DLL
-#if !defined(_WIN32)
-#define K5_ORIGINAL_NAME "leashw.dll\0"
+#if defined(_WIN64)
+#define K5_ORIGINAL_NAME "leashw64.dll\0"
#else
#define K5_ORIGINAL_NAME "leashw32.dll\0"
#endif
@@ -130,8 +130,8 @@
#define K5_DESCRIPTION "Winsock Helper (wshelper) API - " KRB5_PRODUCTNAME_STR "\0"
#define K5_INTERNAL_NAME "wshelper\0"
#define K5_FILETYPE VFT_DLL
-#if !defined(_WIN32)
-#define K5_ORIGINAL_NAME "wshelper.dll\0"
+#if defined(_WIN64)
+#define K5_ORIGINAL_NAME "wshelper64.dll\0"
#else
#define K5_ORIGINAL_NAME "wshelper32.dll\0"
#endif
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
