From 321fd0ceb416bf1c3d074ace4480dc938ca91b60 Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Fri, 27 Jul 2001 17:45:29 +0000
Subject: [PATCH] in named-checkconf, pass in the complete path of named.conf
 as NAMED_CONFFILE instead of constructing it by compile-time concatenation of
 NS_SYSCONFDIR and /named.conf, to facilitate win32 support

---
 bin/check/Makefile.in               | 4 ++--
 bin/check/named-checkconf.c         | 4 ++--
 lib/isc/win32/include/isc/ntpaths.h | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index 5b417dfc25..3930193e75 100644
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.14 2001/06/29 01:04:53 gson Exp $
+# $Id: Makefile.in,v 1.15 2001/07/27 17:45:27 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -25,7 +25,7 @@ top_srcdir =	@top_srcdir@
 
 CINCLUDES =	${DNS_INCLUDES} ${ISCCFG_INCLUDES} ${ISC_INCLUDES}
 
-CDEFINES = 	-DNS_SYSCONFDIR=\"${sysconfdir}\"
+CDEFINES = 	-DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
 CWARNINGS =
 
 DNSLIBS =	../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c
index 8e4f45071b..b53eb5acdf 100644
--- a/bin/check/named-checkconf.c
+++ b/bin/check/named-checkconf.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named-checkconf.c,v 1.11 2001/07/27 04:59:01 mayer Exp $ */
+/* $Id: named-checkconf.c,v 1.12 2001/07/27 17:45:26 gson Exp $ */
 
 #include <config.h>
 
@@ -108,7 +108,7 @@ main(int argc, char **argv) {
 	if (argv[isc_commandline_index] != NULL)
 		conffile = argv[isc_commandline_index];
 	if (conffile == NULL || conffile[0] == '\0')
-		conffile = NS_SYSCONFDIR "/named.conf";
+		conffile = NAMED_CONFFILE;
 
 	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
 
diff --git a/lib/isc/win32/include/isc/ntpaths.h b/lib/isc/win32/include/isc/ntpaths.h
index 25db8925f5..ac68d823d8 100644
--- a/lib/isc/win32/include/isc/ntpaths.h
+++ b/lib/isc/win32/include/isc/ntpaths.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ntpaths.h,v 1.8 2001/07/27 05:16:55 mayer Exp $ */
+/* $Id: ntpaths.h,v 1.9 2001/07/27 17:45:29 gson Exp $ */
 
 /*
  * Windows-specific path definitions
@@ -49,6 +49,8 @@ enum NtPaths {
 #define RNDC_CONFFILE isc_ntpaths_get(RNDC_CONF_PATH)
 #define RNDC_AUTOCONFFILE isc_ntpaths_get(NAMED_KEY_PATH)
 
+#define NAMED_CONFFILE isc_ntpaths_get(NAMED_CONF_PATH)
+
 /*
  * Information about where the files are on disk
  */