[26982] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.10]: Fix KfW startup shortcut installation
daemon@ATHENA.MIT.EDU (Tom Yu)
Wed Aug 29 19:18:21 2012
Date: Wed, 29 Aug 2012 19:17:44 -0400
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201208292317.q7TNHid8017483@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
https://github.com/krb5/krb5/commit/0ca6d062788059a5c59cdf6c3b2b8bf4f2defbc9
commit 0ca6d062788059a5c59cdf6c3b2b8bf4f2defbc9
Author: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date: Tue Aug 21 13:48:32 2012 -0400
Fix KfW startup shortcut installation
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
(cherry picked from commit 626c4055d65e5f0089b634c9fe4a4f6cad21dece)
ticket: 7341
status: resolved
src/windows/installer/wix/features.wxi | 4 +---
src/windows/installer/wix/files.wxi | 9 ++++-----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index b9406de..5777314 100644
--- a/src/windows/installer/wix/features.wxi
+++ b/src/windows/installer/wix/features.wxi
@@ -133,9 +133,7 @@
<Feature Id="feaKfwLeashStartup" AllowAdvertise="no" Display="hidden" Level="130">
<Condition Level="30">LEASHAUTOSTART = 1</Condition>
- <?if $(var.Platform) = "Intel"?>
-<!-- <ComponentRef Id="csc_LeashStartup" /> -->
- <?endif?>
+ <ComponentRef Id="csc_LeashStartup" />
</Feature>
<ComponentRef Id="cmf_remove_folder" />
<?include runtime.wxi?>
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index 6b8d8cf..bdad142 100644
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -191,11 +191,10 @@
<Registry Id="reg_leash_6" Root="HKLM" Key="Software\MIT\Leash" Name="MsLsaImport" Type="integer" Value="[LEASHMSLSAIMPORT]" KeyPath="yes"/>
<Condition>LEASHMSLSAIMPORT</Condition>
</Component>
-<!-- <Component Win64="$(var.Win64)" Id="csc_LeashStartup" Guid="$(var.csc_LeashStartup_guid)" DiskId="1">
- <Registry Id="reg_sc_leash_marker" Root="HKLM" Key="$(var.KfwRegRoot)\Client\$(var.VersionString)" Name="LeashAutoStart" Type="integer" Value="1" KeyPath="yes" />
- <Shortcut Id="sc_leash_exe_startup" Advertise="no" Directory="StartupFolder" Name="Leash Credentials Manager.lnk" Arguments="[LEASHAUTOINIT]" Target="[dirbin]leash32.exe" Show="minimized" />
- <Condition>USELEASH</Condition>
- </Component> -->
+ <Component Win64="$(var.Win64)" Id="csc_LeashStartup" Guid="$(var.csc_LeashStartup_guid)" DiskId="1">
+ <Registry Id="reg_sc_leash_marker" Root="HKCU" Key="$(var.KfwRegRoot)\Client\$(var.VersionString)" Name="LeashAutoStart" Type="integer" Value="1" KeyPath="yes" />
+ <Shortcut Id="sc_leash_exe_startup" Advertise="no" Directory="StartupFolder" Name="MIT Kerberos.lnk" Arguments="[LEASHAUTOINIT]" Target="[dirbin]MIT Kerberos.exe" Show="minimized" />
+ </Component>
<Component Win64="$(var.Win64)" Id="cmf_leash32_chm" Guid="$(var.cmf_leash32_chm_guid)" DiskId="1">
<File Id="fil_leash32_chm" Name="MIT Kerberos.chm" KeyPath="yes" />
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
