Always install krb5.ini in KfW 4.0 installer

Pre-existing krb5.ini files from old kfw versions will be overridden
due to the new search path, but not removed.  This is the desired behavior
since old krb5.ini files are far more likely to cause problems than to
contain useful data.

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
ticket: 7324 (new)
queue: kfw
target_version: 1.10.4
tags: pullup

diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index ff231be50c8f884f788e8e87b60436f18939d321..5a9b5114e6e516161b2e03de48e4a261435d3d7e 100644 (file)
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -462,7 +462,6 @@
       <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>