Wix MSI installer for KFW 3.0 Beta 3

Add operating system version check to ensure it is not
installed on Windows 95, 98, ME or NT 4.0

Break out the license text into its own file

Restructure the installer to allow either NetIdMgr or Leash
to be selected (by transform only) as the credentials manager.
The default is to use NetIdMgr.

ticket: new
component: windows
status: resolved
target_version: 1.4.4
tags: pullup 

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17533 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 12 insertions, 3 deletions

diff --git a/src/windows/installer/wix/custom/custom.cpp b/src/windows/installer/wix/custom/custom.cpp
index dd1fb9c5d0..fdf4bbbd25 100644
--- a/src/windows/installer/wix/custom/custom.cpp
+++ b/src/windows/installer/wix/custom/custom.cpp
@@ -436,16 +436,25 @@ UINT KillRunningProcessesSlave( MSIHANDLE hInstall, BOOL bKill )
                     // try to kill the process
                     HANDLE hProcess = NULL;
 
+                    // If we encounter an error, instead of bailing
+                    // out, we continue on to the next process.  We
+                    // may not have permission to kill all the
+                    // processes we want to kill anyway.  If there are
+                    // any files that we want to replace that is in
+                    // use, Windows Installer will schedule a reboot.
+                    // Also, it's not like we have an exhaustive list
+                    // of all the programs that use Kerberos anyway.
+
                     hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pe.th32ProcessID);
                     if(hProcess == NULL) {
                         rv = GetLastError();
-                        goto _cleanup;
+                        break;
                     }
 
                     if(!TerminateProcess(hProcess, 0)) {
                         rv = GetLastError();
                         CloseHandle(hProcess);
-                        goto _cleanup;
+                        break;
                     }
 
                     CloseHandle(hProcess);
@@ -729,4 +738,4 @@ MSIDLLEXPORT UninstallNetProvider( MSIHANDLE hInstall) {
 #endif
 #ifdef __NMAKE__
 !ENDIF
-#endif
\ No newline at end of file
+#endif