[26928] in CVS-changelog-for-Kerberos-V5
krb5 commit: Update kfw installer OS version checks
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Wed Aug 29 12:50:59 2012
Date: Wed, 29 Aug 2012 12:50:47 -0400
From: Benjamin Kaduk <kaduk@mit.edu>
Message-Id: <201208291650.q7TGollI017859@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/00f5923dd95dac8d98d4058887d144602bbd1f9f
commit 00f5923dd95dac8d98d4058887d144602bbd1f9f
Author: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date: Wed Jul 18 21:14:30 2012 -0400
Update kfw installer OS version checks
Require XP SP3 or Vista SP2 or Windows 7 or Server 2003 or Server 2008
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
ticket: 7307 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
src/windows/installer/wix/kfw.wxs | 4 +++-
src/windows/installer/wix/lang/strings_1033.wxl | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs
index 6b85faa..c0394ee 100644
--- a/src/windows/installer/wix/kfw.wxs
+++ b/src/windows/installer/wix/kfw.wxs
@@ -60,7 +60,9 @@
<!-- Launch conditions -->
<Condition Message="$(loc.AdminRequired)">Privileged</Condition>
- <Condition Message="$(loc.OsVersionRequired)">VersionNT >= 500</Condition>
+ <Condition Message="$(loc.OsVersionRequired)">VersionNT >= 501</Condition>
+ <Condition Message="$(loc.OsXPSP3)">(Not (VersionNT = 501)) Or (ServicePackLevel >= 3)</Condition>
+ <Condition Message="$(loc.OsVistaSP2)">(Not (VersionNT = 600)) Or (ServicePackLevel >= 2)</Condition>
<Condition Message="$(loc.CMNotSelected)">USELEASH Or USENETIDMGR</Condition>
<Condition Message="$(loc.CMDupSelected)">Not (USELEASH And USENETIDMGR)</Condition>
<?if $(var.Platform) = "x64" ?>
diff --git a/src/windows/installer/wix/lang/strings_1033.wxl b/src/windows/installer/wix/lang/strings_1033.wxl
index cd51589..cb530b2 100644
--- a/src/windows/installer/wix/lang/strings_1033.wxl
+++ b/src/windows/installer/wix/lang/strings_1033.wxl
@@ -54,7 +54,9 @@
<String Id="KerberosDocDesc">Documentation</String>
<String Id="AdminRequired">You need administrative privileges to install Kerberos for Windows</String>
- <String Id="OsVersionRequired">This product requires Windows 2000/XP/2003. The current operating system is not supported.</String>
+ <String Id="OsVersionRequired">This product requires Windows XP or Higher. The current operating system is not supported.</String>
+ <String Id="OsXPSP3">This product requires Windows XP Service Pack 3</String>
+ <String Id="OsVistaSP2">This product requires Windows Vista Service Pack 2</String>
<String Id="CMNotSelected">Neither Leash nor Network Identity Manager has been selected for this package. Please contact your administrator or the provider of this installation package to resolve this issue.</String>
<String Id="CMDupSelected">Both Leash and Network Identity Manager has been selected for this package. Only one of these can be selected at one time. Please contact your administrator or the provider of this installation package to resolve this issue.</String>
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
