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

                        in the foreground. [RT #19844]

diff --git a/CHANGES b/CHANGES
index 6707089d93c04beba1db1d682e45a8c3778ef832..ccf4f0164fcd1c6400ed30136fa35f83054e829c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2615.  [port]          win32: 'named -v' should automatically be executed
+                       in the foreground. [RT #19844]
+
 2613.  [bug]           Option argument validation was missing for
                        dnssec-dsfromkey. [RT #19828]
 

diff --git a/bin/named/win32/ntservice.c b/bin/named/win32/ntservice.c
index 74570cf2e6f44fe566804bd731ce0c5a50cc0d40..6dda8bf7061f9fb78876c96cb50c7d76861293a9 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.12 2007/06/19 23:46:59 tbox Exp $ */
+/* $Id: ntservice.c,v 1.12.332.1 2009/06/23 07:51:00 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;
                }