From: Ben Kaduk <kaduk@mit.edu>
Date: Thu, 16 Aug 2012 20:03:48 +0000 (-0400)
Subject: Kill running processes on upgrades/uninstalls
X-Git-Tag: kfw-4.0-final~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0c17dba06e71c39af830f5ae79be80e0754491f;p=thirdparty%2Fkrb5.git

Kill running processes on upgrades/uninstalls

The InstallValidate action of the windows installer will bring up
a dialog informing us that some currently running processes must
be terminated before installation may proceed, and offers to do so,
but does not actually kill the processes.  We have our own code to
kill running processes which did not execute, for two reasons:
it was sequenced after InstallValidate, and we did not have a current
list of processes to look for.

Add the right processes to look for and kill, and use our own
process-killing code since it actually works.

(cherry picked from commit 79e5540860d077693e70b340db4d69d5e15107b7)

ticket: 7343
status: resolved
---

diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs
index 20a70e5ed7..d00c6e88e8 100755
--- a/src/windows/installer/wix/kfw.wxs
+++ b/src/windows/installer/wix/kfw.wxs
@@ -168,8 +168,9 @@
 	<!-- Installation Sequences -->
 	<AdminExecuteSequence />
         <InstallExecuteSequence>
-	<Custom Action="KillRunningProcesses" After="InstallValidate"/>
-	<RemoveExistingProducts After="KillRunningProcesses">(Not Installed) And (UPGRADEPISMERE Or UPGRADEKFW Or UPGRADEKFW64)</RemoveExistingProducts>
+	<Custom Action="ListRunningProcesses" Before="KillRunningProcesses" />
+	<Custom Action="KillRunningProcesses" Before="InstallValidate"/>
+	<RemoveExistingProducts After="InstallValidate">(Not Installed) And (UPGRADEPISMERE Or UPGRADEKFW Or UPGRADEKFW64)</RemoveExistingProducts>
 	<Custom Action="RenameKrb5Ini_Cmd" Before="RenameKrb5Ini"/>
 	<Custom Action="RenameKrb5Ini" Before="InstallFinalize">SYSTEMKRB5INI &lt;&gt; ""</Custom>
 	<!-- When running with a UI, CCP_Success property is not passed down to the server. -->
@@ -236,6 +237,11 @@
                 <Data Column="Image">krbcc32s.exe</Data>
                 <Data Column="Desc">Kerberos Credential Cache</Data>
             </Row>
+            <Row>
+                <Data Column="Id">kpKrbcc64</Data>
+                <Data Column="Image">krbcc64s.exe</Data>
+                <Data Column="Desc">Kerberos Credential Cache</Data>
+            </Row>
             <Row>
                 <Data Column="Id">kpK95</Data>
                 <Data Column="Image">k95.exe</Data>
@@ -261,6 +267,16 @@
                 <Data Column="Image">afscreds.exe</Data>
                 <Data Column="Desc">AFS Credentials Manager</Data>
             </Row>
+            <Row>
+                <Data Column="Id">kccapiserver</Data>
+                <Data Column="Image">ccapiserver.exe</Data>
+                <Data Column="Desc">Credentials Cache API Server</Data>
+            </Row>
+            <Row>
+                <Data Column="Id">kMITKerberos</Data>
+                <Data Column="Image">MIT Kerberos.exe</Data>
+                <Data Column="Desc">MIT Kerberos Ticket Manager</Data>
+            </Row>
         </CustomTable>
     </Product>
 </Wix>