[26233] in CVS-changelog-for-Kerberos-V5
svn rev #25573: trunk/src/windows/installer/wix/
daemon@ATHENA.MIT.EDU (tlyu@mit.edu)
Mon Dec 12 15:46:35 2011
Date: Mon, 12 Dec 2011 15:46:33 -0500
From: tlyu@mit.edu
Message-Id: <201112122046.pBCKkXZ4006271@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=25573
Commit By: tlyu
Log Message:
ticket: 7050
subject: kfw installer: install krb5.ini to CommonAppDataFolder, not WindowsFolder
..but only if there isn't already a krb5.ini in the WindowsFolder.
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:46:30 UTC (rev 25572)
+++ trunk/src/windows/installer/wix/features.wxi 2011-12-12 20:46:33 UTC (rev 25573)
@@ -123,8 +123,6 @@
<ComponentRef Id="cmf_psapi_dll" />
<ComponentRef Id="cmf_krb5_ini" />
- <ComponentRef Id="cmf_krb_con" />
- <ComponentRef Id="cmf_krbrealm_con" />
<ComponentRef Id="rcm_common" />
<ComponentRef Id="rcm_client" />
Modified: trunk/src/windows/installer/wix/files.wxi
===================================================================
--- trunk/src/windows/installer/wix/files.wxi 2011-12-12 20:46:30 UTC (rev 25572)
+++ trunk/src/windows/installer/wix/files.wxi 2011-12-12 20:46:33 UTC (rev 25573)
@@ -26,6 +26,12 @@
-->
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Property Id="DISABLEADVTSHORTCUTS" Value="1" />
+ <Property Id="SYSTEMKRB5INI">
+ <DirectorySearch Id="WindowsFolder" Path="[WindowsFolder]">
+ <FileSearch Name="krb5.ini"/>
+ </DirectorySearch>
+ </Property>
+
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="DesktopFolder" Name="Desktop"/>
<Directory Id="$(var.PISystemFolder)" SourceName="System">
@@ -437,16 +443,16 @@
</Directory> <!-- /Kerberos -->
</Directory> <!-- /MIT -->
</Directory> <!-- /Program Files -->
- <Directory Id="WindowsFolder">
- <Component Win64="$(var.Win64)" Id="cmf_krb5_ini" Guid="C1AF0670-BBF1-4AA6-B2A6-6C8B1584A1F4" NeverOverwrite="yes" Permanent="yes" DiskId="1">
- <File Id="fil_krb5_ini" Name="krb5.ini" src="$(var.ConfigDir)krb5.ini" KeyPath="yes" />
- </Component>
- <Component Win64="$(var.Win64)" Id="cmf_krb_con" Guid="5E91A051-CF14-45FF-BF64-CEE78A7A90C2" NeverOverwrite="yes" Permanent="yes" DiskId="1">
- <File Id="fil_krb_con" Name="krb.con" src="$(var.ConfigDir)krb.con" KeyPath="yes" />
- </Component>
- <Component Win64="$(var.Win64)" Id="cmf_krbrealm_con" Guid="D667B54F-1C98-43FB-87C6-0F0517623B90" NeverOverwrite="yes" Permanent="yes" DiskId="1">
- <File Id="fil_krbrealm_con" Name="krbrealm.con" src="$(var.ConfigDir)krbrealm.con" KeyPath="yes" />
- </Component>
+ <Directory Id="CommonAppDataFolder" Name="CommonAppDataFolder">
+ <Directory Id="APPDATAMITDIR" Name="MIT">
+ <Directory Id="APPDATAKERBEROS5DIR" Name="Kerberos5">
+ <Component Win64="$(var.Win64)" Id="cmf_krb5_ini" Guid="C1AF0670-BBF1-4AA6-B2A6-6C8B1584A1F4" NeverOverwrite="yes" Permanent="yes" DiskId="1">
+ <Condition>NOT SYSTEMKRB5INI</Condition>
+ <File Id="fil_krb5_ini" Name="krb5.ini" src="$(var.ConfigDir)krb5.ini" KeyPath="yes" />
+ <CreateFolder/>
+ </Component>
+ </Directory>
+ </Directory>
</Directory>
<Directory Id="ProgramMenuFolder">
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
