diff options
| author | Tom Yu <tlyu@mit.edu> | 2011-12-12 20:46:33 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2011-12-12 20:46:33 +0000 |
| commit | a94a32fdff046db472dbab40d276b92d210b0be2 (patch) | |
| tree | b9345c9f6bf536888f21089cfb4ad22f352718d2 /src/windows/installer/wix | |
| parent | 7467714bb1b30b5153c4d74845d6d0fe26b90e00 (diff) | |
| download | krb5-a94a32fdff046db472dbab40d276b92d210b0be2.tar.gz krb5-a94a32fdff046db472dbab40d276b92d210b0be2.tar.xz krb5-a94a32fdff046db472dbab40d276b92d210b0be2.zip | |
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>
ticket: 7050
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25573 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/installer/wix')
| -rw-r--r-- | src/windows/installer/wix/features.wxi | 2 | ||||
| -rw-r--r-- | src/windows/installer/wix/files.wxi | 26 |
2 files changed, 16 insertions, 12 deletions
diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi index 788f863c03..572cce6421 100644 --- a/src/windows/installer/wix/features.wxi +++ b/src/windows/installer/wix/features.wxi @@ -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" /> diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi index 6b75a55de3..10f33604b1 100644 --- a/src/windows/installer/wix/files.wxi +++ b/src/windows/installer/wix/files.wxi @@ -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"> |