2615. [port] win32: 'named -v' should automatically be executed

                        in the foreground. [RT #19844]

diff --git a/CHANGES b/CHANGES
index 9fd039ade831af3917d779485a72f920383fd080..85c7629fd9f64068931e0a8a80cd93590053a04d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2615.  [port]          win32: 'named -v' should automatically be executed
+                       in the foreground. [RT #19844]
+
 2610.  [port]          sunos: Change #2363 was not complete. [RT #19796]
 
 2606.  [bug]           "delegation-only" was not being accepted in

diff --git a/bin/named/win32/ntservice.c b/bin/named/win32/ntservice.c
index 6d38d912020031c560df0138f7e406976e72dca7..6b106ac320da9a7770e0ebb530fa6b7dcee9c01e 100644 (file)
--- a/bin/named/win32/ntservice.c
+++ b/bin/named/win32/ntservice.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntservice.c,v 1.8 2004/03/05 04:58:08 marka Exp $ */
+/* $Id: ntservice.c,v 1.8.18.1 2009/06/23 07:49:14 marka Exp $ */
 
 #include <config.h>
 #include <stdio.h>
@@ -65,9 +65,12 @@ int bindmain()
         */
        GetArgs(&argc, &argv, &envp);
 
-       /* Command line users should put -f in the options */
+       /* Command line users should put -f in the options. */
+       /* XXXMPA should use isc_commandline_parse() here. */
        while (argv[i]) {
-               if (!strcmp(argv[i], "-f") || !strcmp(argv[i], "-g")) {
+               if (!strcmp(argv[i], "-f") ||
+                   !strcmp(argv[i], "-g") ||
+                   !strcmp(argv[i], "-v")) {
                        foreground = TRUE;
                        break;
                }