diff options
| author | Benjamin Kaduk <kaduk@mit.edu> | 2012-07-30 16:50:55 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2012-08-29 14:50:20 -0400 |
| commit | 02499b9c31124d66cdc5fd5d650e38f8c408a984 (patch) | |
| tree | 25d069fa87dbff1cec7347647e85fbe5b4a6442b /src | |
| parent | f468fc02ff3b32c12f0f41662a05a9bf07680b87 (diff) | |
| download | krb5-02499b9c31124d66cdc5fd5d650e38f8c408a984.tar.gz krb5-02499b9c31124d66cdc5fd5d650e38f8c408a984.tar.xz krb5-02499b9c31124d66cdc5fd5d650e38f8c408a984.zip | |
Rename old krb5.ini files away
We want to always use a new krb5.ini (and our search order guarantees
that we will), but users might be confused if there is still a file
named krb5.ini in the old location which is now non-functional.
However, it is rude to unconditionally delete the old file which may
potentially be the only copy a user has of their local changes.
Instead, rename the old file to a non-functioning name that indicates
it is no longer being used, so that it may be consulted if needed.
Only attempt the rename if we found an existing krb5.ini, and ignore errors
since this is not a critical part of the installation.
ticket: 7328 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
Diffstat (limited to 'src')
| -rw-r--r-- | src/windows/installer/wix/Makefile | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/windows/installer/wix/kfw.wxs | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/windows/installer/wix/Makefile b/src/windows/installer/wix/Makefile index 7b66b1211c..3c2bfd691f 100644 --- a/src/windows/installer/wix/Makefile +++ b/src/windows/installer/wix/Makefile @@ -45,7 +45,7 @@ $(OBJFILE): kfw.wxs $(WIXINCLUDES) $(MSIFILE): $(OBJFILE) $(CUSTOMDLL) $(LIGHT) -out $@ $(OBJFILE) \ - -loc lang\strings_$(LANG).wxl + -loc lang\strings_$(LANG).wxl -ext WixUtilExtension.dll $(CUSTOMDLL): custom\custom.cpp $(CD) custom diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs index c0394ee0ce..74ef8ac0cf 100644..100755 --- a/src/windows/installer/wix/kfw.wxs +++ b/src/windows/installer/wix/kfw.wxs @@ -146,6 +146,18 @@ Return="ignore" Execute="deferred" /> + <CustomAction Id="RenameKrb5Ini_Cmd" + Property="RenameKrb5Ini" + Value=""cmd.exe" /c rename "[WindowsFolder]\krb5.ini" krb5-ini-pre-kfw4" + Execute="immediate" /> + <CustomAction + Id="RenameKrb5Ini" + BinaryKey="WixCA" + DllEntry="CAQuietExec" + Execute="deferred" + Impersonate="no" + Return="ignore" /> + <CustomAction Id="RollbackNetProvider" BinaryKey="binCustom" @@ -158,6 +170,8 @@ <InstallExecuteSequence> <Custom Action="KillRunningProcesses" After="InstallValidate"/> <RemoveExistingProducts After="KillRunningProcesses">(Not Installed) And (UPGRADEPISMERE Or UPGRADEKFW)</RemoveExistingProducts> + <Custom Action="RenameKrb5Ini_Cmd" Before="RenameKrb5Ini"/> + <Custom Action="RenameKrb5Ini" Before="InstallFinalize">SYSTEMKRB5INI <> ""</Custom> <!-- When running with a UI, CCP_Success property is not passed down to the server. --> <Custom Action="AbortNoIE" Before="RemoveNsisInstallation">UILevel = 0 And (Not Installed) And (CCP_Success <> 1)</Custom> <Custom Action="RemoveNsisInstallation" Before="AbortCantRemoveNSIS">UPGRADENSIS <> "" And UILevel >= 4</Custom> |