From: Mark Andrews <marka@isc.org>
Date: Fri, 29 May 2009 02:14:31 +0000 (+0000)
Subject: 2603.   [port]          win32: handle .exe extension of named-checkzone and
X-Git-Tag: v9.7.0a1~71
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=fc7ecc628dcdc1cfceee6f2dd52bc7c433eb1b8b;p=thirdparty%2Fbind9.git

2603.   [port]          win32: handle .exe extension of named-checkzone and
                        named-comilezone argv[0] names under windows.
                        [RT #19767]
---

diff --git a/CHANGES b/CHANGES
index f8eaa62a85c..575b1baf40c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2603.	[port]		win32: handle .exe extension of named-checkzone and
+			named-comilezone argv[0] names under windows.
+			[RT #19767]
+
 2602.	[port]		win32: fix debugging command line build of libisccfg.
 			[RT #19767]
 
diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c
index 5232e0f3b13..88f33474809 100644
--- a/bin/check/named-checkzone.c
+++ b/bin/check/named-checkzone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named-checkzone.c,v 1.53 2009/02/16 23:48:04 tbox Exp $ */
+/* $Id: named-checkzone.c,v 1.54 2009/05/29 02:14:31 marka Exp $ */
 
 /*! \file */
 
@@ -123,9 +123,13 @@ main(int argc, char **argv) {
 	 */
 	if (strncmp(prog_name, "lt-", 3) == 0)
 		prog_name += 3;
-	if (strcmp(prog_name, "named-checkzone") == 0)
+
+#define PROGCMP(X) \
+	(strcasecmp(prog_name, X) == 0 || strcasecmp(prog_name, X ".exe") == 0)
+
+	if (PROGCMP("named-checkzone"))
 		progmode = progmode_check;
-	else if (strcmp(prog_name, "named-compilezone") == 0)
+	else if (PROGCMP("named-compilezone"))
 		progmode = progmode_compile;
 	else
 		INSIST(0);