From 00f5923dd95dac8d98d4058887d144602bbd1f9f Mon Sep 17 00:00:00 2001
From: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date: Wed, 18 Jul 2012 21:14:30 -0400
Subject: 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(-)

(limited to 'src/windows/installer')

diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs
index 6b85faaf83..c0394ee0ce 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 &gt;= 500</Condition>
+        <Condition Message="$(loc.OsVersionRequired)">VersionNT &gt;= 501</Condition>
+        <Condition Message="$(loc.OsXPSP3)">(Not (VersionNT = 501)) Or (ServicePackLevel &gt;= 3)</Condition>
+        <Condition Message="$(loc.OsVistaSP2)">(Not (VersionNT = 600)) Or (ServicePackLevel &gt;= 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 cd515895be..cb530b2fec 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>
 
-- 
cgit