summaryrefslogtreecommitdiffstats
path: root/src/windows/installer
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2011-12-12 20:45:03 +0000
committerTom Yu <tlyu@mit.edu>2011-12-12 20:45:03 +0000
commit059cde6e4e7be214820f52a23dbe9b86b6ab37f8 (patch)
treeb17aba37ba08372aad5a3a68320825a26dbe2011 /src/windows/installer
parente34d9b3462c3415bd84ddfbe15b50a99cbc503c9 (diff)
downloadkrb5-059cde6e4e7be214820f52a23dbe9b86b6ab37f8.tar.gz
krb5-059cde6e4e7be214820f52a23dbe9b86b6ab37f8.tar.xz
krb5-059cde6e4e7be214820f52a23dbe9b86b6ab37f8.zip
kfw installer: install leash32.exe
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com> ticket: 7050 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25548 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/installer')
-rw-r--r--src/windows/installer/wix/features.wxi2
-rw-r--r--src/windows/installer/wix/files.wxi6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index fcb6d59ce8..609769b59b 100644
--- a/src/windows/installer/wix/features.wxi
+++ b/src/windows/installer/wix/features.wxi
@@ -80,7 +80,7 @@
<ComponentRef Id="cmf_leashw32_dll" />
<?if $(var.Platform) = "Intel" ?>
-<!-- <ComponentRef Id="cmf_leash32_exe" /> -->
+ <ComponentRef Id="cmf_leash32_exe" />
<!-- <ComponentRef Id="csc_leash32_exe" /> -->
<?endif?>
<ComponentRef Id="cmf_kfwlogon_DLL" />
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index 200d24f151..9b4e0f5443 100644
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -144,11 +144,11 @@
<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">
+ <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" />
- <Registry Id="reg_ts_leash32_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\leash32" Action="createKeyAndRemoveKeyOnUninstall" KeyPath="yes"/>
+ <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" />
- </Component> -->
+ </Component>
<!-- <Component Win64="$(var.Win64)" Id="csc_leash32_exe" Guid="$(var.csc_leash32_exe_guid)" DiskId="1">
<Shortcut Id="sc_leash32_exe" Advertise="no" Directory="dirShortcut" Name="Leash Kerberos Ticket Manager.lnk" Arguments="[LEASHAUTOINIT]" Target="[!fil_leash32_exe]" />