kfw: rename leash32/64.exe to simply leash.exe

Also install leash.exe in 64 bit installer.

ticket: 7050

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

6 files changed, 13 insertions, 20 deletions

diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index 2e0f65f07e..788f863c03 100644
--- a/src/windows/installer/wix/features.wxi
+++ b/src/windows/installer/wix/features.wxi
@@ -79,10 +79,8 @@
 
             <ComponentRef Id="cmf_leashw32_dll" />
 
-        <?if $(var.Platform) = "Intel" ?>
-            <ComponentRef Id="cmf_leash32_exe" />
+            <ComponentRef Id="cmf_leash_exe" />
 <!--            <ComponentRef Id="csc_leash32_exe" /> -->
-        <?endif?>
 	    <ComponentRef Id="cmf_kfwlogon_DLL" />
             <ComponentRef Id="cmf_kfwcpcc_EXE" />
 
@@ -91,7 +89,6 @@
             <ComponentRef Id="rcm_krb5_2" />
             <ComponentRef Id="rcm_krb5_3" />
 
-        <?if $(var.Platform) = "Intel" ?>
             <!-- Leash config options -->
             <ComponentRef Id="rcm_leash_1" />
             <ComponentRef Id="rcm_leash_2" />
@@ -104,7 +101,6 @@
         <?else?>
             <ComponentRef Id="cmf_leash32_chm" />
         <?endif?> -->
-        <?endif?>
             
             <!-- Leash dll options -->
             <ComponentRef Id="rcm_leashdll_1" />
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index 9bccfe7a9e..6b75a55de3 100644
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -145,11 +145,10 @@
 	                    <Registry Id="reg_ts_krbcc32s_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\ccapiserver" Action="createKeyAndRemoveKeyOnUninstall" />
 	                    <Registry Id="reg_ts_krbcc32s_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\ccapiserver" Name="Flags" Type="integer" Value="1032" />
                     </Component>
-        <?if $(var.Platform) = "Intel" ?>
-                    <Component Win64="$(var.Win64)" Id="cmf_leash32_exe" Guid="$(var.cmf_leash32_exe_guid)" DiskId="1">
-                      <File Id="fil_leash32_exe" Name="leash32.exe" KeyPath="yes">
-                        <Shortcut Id="sc_leash32_exe" Advertise="yes" Directory="dirShortcut" Name="Leash Kerberos Ticket Manager.lnk" Arguments="[LEASHAUTOINIT]" />
-                        <Shortcut Id="sc_leash32_desktop_exe" Advertise="yes" Directory="DesktopFolder" Name="Leash Kerberos Ticket Manager.lnk" Arguments="[LEASHAUTOINIT]" />
+                    <Component Win64="$(var.Win64)" Id="cmf_leash_exe" Guid="$(var.cmf_leash_exe_guid)" DiskId="1">
+                      <File Id="fil_leash_exe" Name="leash.exe" KeyPath="yes">
+                        <Shortcut Id="sc_leash_exe" Advertise="yes" Directory="dirShortcut" Name="Leash Kerberos Ticket Manager.lnk" Arguments="[LEASHAUTOINIT]" />
+                        <Shortcut Id="sc_leash_desktop_exe" Advertise="yes" Directory="DesktopFolder" Name="Leash Kerberos Ticket Manager.lnk" Arguments="[LEASHAUTOINIT]" />
                       </File>
                       <Registry Id="reg_ts_leash32_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\leash32" Action="createKeyAndRemoveKeyOnUninstall" />
 	                    <Registry Id="reg_ts_leash32_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\leash32" Name="Flags" Type="integer" Value="1032" />
@@ -201,7 +200,6 @@
 	                    <File Id="fil_leash32_chm" Name="leash32.chm" KeyPath="yes" />
                     </Component>
                 <?endif?> -->
-        <?endif?>
                     
                     <Component Win64="$(var.Win64)" Id="cmf_leashw32_dll" Guid="$(var.cmf_leashw32_dll_guid)" DiskId="1">
 	                    <File Id="fil_leashw32_dll" Name="$(var.cmf_leashw32_dll_name)" KeyPath="yes" />
diff --git a/src/windows/installer/wix/platform.wxi b/src/windows/installer/wix/platform.wxi
index ab7d0f5d78..fb7f37f6a1 100644
--- a/src/windows/installer/wix/platform.wxi
+++ b/src/windows/installer/wix/platform.wxi
@@ -38,12 +38,12 @@
         <?define cmf_krb524_dll_name="krb524.dll"?>
         <?define cmf_krbcc32_dll_guid="56DAD1B9-4A59-46e6-81CA-54E2B6C9D618"?>
         <?define cmf_krbcc32_dll_name="krbcc64.dll"?>
-        <?define cmf_ccpaiserver_exe_guid="0192F58B-9129-426d-A271-E18455EDC80E"?>
+        <?define cmf_ccapiserver_exe_guid="0192F58B-9129-426d-A271-E18455EDC80E"?>
         <?define cmf_ccapiserver_exe_name="ccapiserver.exe"?>
         <?define cmf_krbv4w32_dll_guid="D195FADB-A3B0-4023-A824-8895552CDC56"?>
         <?define cmf_krbv4w32_dll_name="krbv4w64.dll"?>
-        <?define cmf_leash32_exe_guid="D195FADB-A3B0-4023-A824-8895552CDC56"?>
-        <?define csc_leash32_exe_guid="9D43350A-A8AE-4405-AB82-64E90E5A1A70"?>
+        <?define cmf_leash_exe_guid="D195FADB-A3B0-4023-A824-8895552CDC56"?>
+        <?define csc_leash_exe_guid="9D43350A-A8AE-4405-AB82-64E90E5A1A70"?>
         <?define rcm_leash_1_guid="7E5517FF-FB76-431f-A92B-2895C9BE7E98"?>
         <?define rcm_leash_2_guid="008208AC-46BE-4ca4-BEA7-8FCAAD8BA7C3"?>
         <?define rcm_leash_3_guid="66D97178-E735-499b-961F-C7B8B8074E1A"?>
@@ -127,8 +127,8 @@
         <?define cmf_ccapiserver_exe_name="ccapiserver.exe"?>
         <?define cmf_krbv4w32_dll_guid="DFA23F6C-5297-4876-AF52-6F7CF2CB34AC"?>
         <?define cmf_krbv4w32_dll_name="krbv4w32.dll"?>
-        <?define cmf_leash32_exe_guid="990D5F6B-4CEE-4706-96F4-F7AF12F97DF7"?>
-        <?define csc_leash32_exe_guid="8A096700-47B1-4A0B-B7B5-44F75086DEAE"?>
+        <?define cmf_leash_exe_guid="990D5F6B-4CEE-4706-96F4-F7AF12F97DF7"?>
+        <?define csc_leash_exe_guid="8A096700-47B1-4A0B-B7B5-44F75086DEAE"?>
         <?define rcm_leash_1_guid="B91648A0-26F7-43BB-A954-202FF3811E3C"?>
         <?define rcm_leash_2_guid="0D8DCC52-F855-4C46-86A1-198E6EE0CB8A"?>
         <?define rcm_leash_3_guid="9610A7E3-251F-4286-B776-1C3AF5DE7815"?>
diff --git a/src/windows/leash/Lglobals.h b/src/windows/leash/Lglobals.h
index be9ae3e0aa..2ec5f756a8 100644
--- a/src/windows/leash/Lglobals.h
+++ b/src/windows/leash/Lglobals.h
@@ -230,7 +230,7 @@ extern DECL_FUNC_PTR(profile_release_string);
 #define KRBREALM_FILE	"KRBREALM.CON"
 #define TICKET_FILE		"TICKET.KRB"
 
-#define LEASH_HELP_FILE "leash32.chm"
+#define LEASH_HELP_FILE "leash.chm"
 
 extern int  config_boolean_to_int(const char *);
 extern BOOL SetRegistryVariable(const CString& regVariable,
diff --git a/src/windows/leash/Makefile.in b/src/windows/leash/Makefile.in
index 1b1ae69056..1edf6b45e9 100644
--- a/src/windows/leash/Makefile.in
+++ b/src/windows/leash/Makefile.in
@@ -15,11 +15,10 @@ AFS_LIBS=
 !endif
 
 MFCLIB=MFC100D.LIB
-EXE_NAME=leash32
+EXE_NAME=leash
 WSHELPER=wshelp32
 
 !if ("$(CPU)" == "IA64") || ("$(CPU)" == "AMD64") || ("$(CPU)" == "ALPHA64")
-EXE_NAME=leash64
 WSHELPER=wshelp64
 !endif
 
diff --git a/src/windows/version.rc b/src/windows/version.rc
index 61f3a81137..c4f1514485 100644
--- a/src/windows/version.rc
+++ b/src/windows/version.rc
@@ -112,7 +112,7 @@
 #define K5_DESCRIPTION "Leash32 Kerberos Ticket Manager - " KRB5_PRODUCTNAME_STR "\0"
 #define K5_FILETYPE	VFT_APP
 #define K5_INTERNAL_NAME "LEASH\0"
-#define K5_ORIGINAL_NAME "leash32.exe\0"
+#define K5_ORIGINAL_NAME "leash.exe\0"
 #endif
 
 #ifdef LEASHDLL_LIB