Remove psapi.dll from installer

psapi.dll is a standard windows component; no need for kfw to redistribute.

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

diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index fa8c8f0d3dfc4a0317785df094041aa49a73135e..4fd1d060125dcdf62682f8f57e0f5d8e2bc1150f 100644 (file)
--- a/src/windows/installer/wix/features.wxi
+++ b/src/windows/installer/wix/features.wxi
@@ -116,8 +116,6 @@
             <ComponentRef Id="rcm_leashdll_16" />
             <ComponentRef Id="rcm_leashdll_17" />
             
-            <ComponentRef Id="cmf_psapi_dll" />
-            
             <ComponentRef Id="cmf_krb5_ini" />
             
             <ComponentRef Id="rcm_common" />

diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index a7245e7e45e37cd9f15e9cb004e9a7eaf89e4ee2..0d75b988ee8d0fe5db0aeef192e11fdae8a2a350 100644 (file)
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -331,11 +331,7 @@
                            <File Id="fil_mit2ms_pdb" Name="mit2ms.pdb" />
                     </Component>
                 <?endif?>
-                
-                    <Component Win64="$(var.Win64)" Id="cmf_psapi_dll" Guid="877F4DD5-8AE0-451C-8F4D-C27F6F30D221" DiskId="1">
-                           <File Id="fil_psapi_dll" Name="psapi.dll" src="$(var.SystemDir)psapi.dll" KeyPath="yes" />
-                    </Component>
-                
+
                 </Directory> <!-- /bin -->
                 
                 <Directory Id="dirinc" Name="include" src="$(var.IncDir)">