Add check and warning message for Windows 2000 systems not running Service Pack 2...

diff --git a/bin/named/win32/include/named/ntservice.h b/bin/named/win32/include/named/ntservice.h
index 4ae97f823c784caf2fc0d5ba6f76436fd3cd9de3..de1d5c971dd1f4d03f3d9bfebe872d3997dc0353 100644 (file)
--- a/bin/named/win32/include/named/ntservice.h
+++ b/bin/named/win32/include/named/ntservice.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntservice.h,v 1.1 2001/07/18 03:43:18 mayer Exp $ */
+/* $Id: ntservice.h,v 1.2 2002/08/03 01:31:48 mayer Exp $ */
 
 #ifndef NTSERVICE_H
 #define NTSERVICE_H
@@ -31,4 +31,5 @@ void UpdateSCM(DWORD);
 void ServiceControl(DWORD dwCtrlCode);
 void 
 ntservice_shutdown();
+BOOL ntservice_isservice();
 #endif
\ No newline at end of file

diff --git a/bin/named/win32/ntservice.c b/bin/named/win32/ntservice.c
index 488119f64b149dcd4c826e08077de9513b750967..1b3f891345ceda388afd438d52adc6d461b7fe0a 100644 (file)
--- a/bin/named/win32/ntservice.c
+++ b/bin/named/win32/ntservice.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntservice.c,v 1.6 2002/02/20 03:33:36 marka Exp $ */
+/* $Id: ntservice.c,v 1.7 2002/08/03 01:31:48 mayer Exp $ */
 
 #include <config.h>
 #include <stdio.h>
@@ -30,7 +30,7 @@
 
 /* Handle to SCM for updating service status */
 static SERVICE_STATUS_HANDLE hServiceStatus = 0;
-static int foreground = FALSE;
+static BOOL foreground = FALSE;
 static char ConsoleTitle[128];
 
 /*
@@ -122,7 +122,13 @@ void
 ntservice_shutdown() {
        UpdateSCM(SERVICE_STOPPED);
 }
-
+/*
+ * Routine to check if this is a service or a foreground program
+ */
+BOOL
+ntservice_isservice() {
+       return(!foreground);
+}
 /* 
  * ServiceControl(): Handles requests from the SCM and passes them on
  * to named.

diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c
index 15d6f296c364470631e2db2346d5a3d3faf10226..9ffcf70fdd07f62716de377156f2d6fe2a72963b 100644 (file)
--- a/bin/named/win32/os.c
+++ b/bin/named/win32/os.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.16 2002/08/01 03:25:34 mayer Exp $ */
+/* $Id: os.c,v 1.17 2002/08/03 01:31:48 mayer Exp $ */
 
 #include <config.h>
 #include <stdarg.h>
@@ -37,8 +37,10 @@
 #include <isc/string.h>
 #include <isc/ntpaths.h>
 #include <isc/util.h>
+#include <isc/win32os.h>
 
 #include <named/main.h>
+#include <named/log.h>
 #include <named/os.h>
 #include <named/globals.h>
 #include <named/ntservice.h>
@@ -48,6 +50,9 @@ static char *pidfile = NULL;
 
 static BOOL Initialized = FALSE;
 
+static char *version_error = 
+       "named requires Windows 2000 Service Pack 2 or later to run correctly";
+
 void
 ns_paths_init() {
        if (!Initialized)
@@ -64,6 +69,22 @@ ns_paths_init() {
        Initialized = TRUE;
 }
 
+/*
+ * Due to Knowledge base article Q263823 we need to make sure that
+ * Windows 2000 systems have Service Pack 2 or later installed and
+ * warn when it isn't.
+ */
+static void
+version_check(const char *progname) {
+
+       if(isc_win32os_majorversion() < 5)
+               return; /* No problem with Version 4.0 */
+       if(isc_win32os_versioncheck(5, 0, 2, 0) < 0)
+               if (ntservice_isservice())
+                       NTReportError(progname, version_error);
+               else 
+                       fprintf(stderr, "%s\n", version_error);
+}
 
 static void
 setup_syslog(const char *progname) {
@@ -82,6 +103,7 @@ ns_os_init(const char *progname) {
        ns_paths_init();
        setup_syslog(progname);
        ntservice_init();
+       version_check(progname);
 }
 
 void