[26208] in CVS-changelog-for-Kerberos-V5
svn rev #25548: trunk/src/windows/installer/wix/
daemon@ATHENA.MIT.EDU (tlyu@mit.edu)
Mon Dec 12 15:45:06 2011
Date: Mon, 12 Dec 2011 15:45:03 -0500
From: tlyu@mit.edu
Message-Id: <201112122045.pBCKj3M5004928@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=25548
Commit By: tlyu
Log Message:
ticket: 7050
subject: kfw installer: install leash32.exe
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
Changed Files:
U trunk/src/windows/installer/wix/features.wxi
U trunk/src/windows/installer/wix/files.wxi
Modified: trunk/src/windows/installer/wix/features.wxi
===================================================================
--- trunk/src/windows/installer/wix/features.wxi 2011-12-12 20:44:59 UTC (rev 25547)
+++ trunk/src/windows/installer/wix/features.wxi 2011-12-12 20:45:03 UTC (rev 25548)
@@ -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" />
Modified: trunk/src/windows/installer/wix/files.wxi
===================================================================
--- trunk/src/windows/installer/wix/files.wxi 2011-12-12 20:44:59 UTC (rev 25547)
+++ trunk/src/windows/installer/wix/files.wxi 2011-12-12 20:45:03 UTC (rev 25548)
@@ -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]" />
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
