diff options
| author | Jeffrey Altman <jaltman@secure-endpoints.com> | 2005-12-02 10:29:29 +0000 |
|---|---|---|
| committer | Jeffrey Altman <jaltman@secure-endpoints.com> | 2005-12-02 10:29:29 +0000 |
| commit | 8c2441d9a6928bb6fbe699a4254c83679d4a29f9 (patch) | |
| tree | 8fbfb3d22aab60f0acca8f8be8fc2e3de38779dc /src/windows/installer/wix/custom | |
| parent | ee2846c05ae4211c2838f1ac35b135b454362489 (diff) | |
| download | krb5-8c2441d9a6928bb6fbe699a4254c83679d4a29f9.tar.gz krb5-8c2441d9a6928bb6fbe699a4254c83679d4a29f9.tar.xz krb5-8c2441d9a6928bb6fbe699a4254c83679d4a29f9.zip | |
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
Diffstat (limited to 'src/windows/installer/wix/custom')
| -rw-r--r-- | src/windows/installer/wix/custom/custom.cpp | 15 | ||||
| -rw-r--r-- | src/windows/installer/wix/custom/custom.h | 8 |
2 files changed, 16 insertions, 7 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 diff --git a/src/windows/installer/wix/custom/custom.h b/src/windows/installer/wix/custom/custom.h index 9fcc61e65e..2e66671a1a 100644 --- a/src/windows/installer/wix/custom/custom.h +++ b/src/windows/installer/wix/custom/custom.h @@ -75,7 +75,7 @@ MSIDLLEXPORT UninstallNetProvider ( MSIHANDLE ); /* Custom errors */ #define ERR_CUSTACTDATA 4001 -#define ERR_NSS_FAILED 4003 -#define ERR_ABORT 4004 -#define ERR_PROC_LIST 4006 -#define ERR_NPI_FAILED 4007 +#define ERR_NSS_FAILED 4003 +#define ERR_ABORT 4004 +#define ERR_PROC_LIST 4006 +#define ERR_NPI_FAILED 4007 |