From e17d517a93ffb4905ab659c437c7babe95f6d848 Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Thu, 4 Oct 2001 22:05:30 +0000
Subject: [PATCH] pullup: 1028.   [bug]           On Win32, dig/host/nslookup
 looked for resolv.conf                         in the wrong directory. [RT
 #1833]

---
 CHANGES                   | 3 +++
 bin/dig/dighost.c         | 4 ++--
 bin/dig/include/dig/dig.h | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5defbfe044..1d0697b23d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@
 			of the configuration file to return a failure
 			status even though they were logged. [RT #1847]
 
+1028.	[bug]		On Win32, dig/host/nslookup looked for resolv.conf
+			in the wrong directory. [RT #1833]
+
 1027.	[bug]		RRs having the reserved type 0 should be rejected.
 			[RT #1471]
 
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index a0b19e8bb5..a878686722 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.221.2.2 2001/09/27 23:30:46 gson Exp $ */
+/* $Id: dighost.c,v 1.221.2.3 2001/10/04 22:03:41 gson Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -594,7 +594,7 @@ setup_system(void) {
 
 	free_now = ISC_FALSE;
 	get_servers = ISC_TF(server_list.head == NULL);
-	fp = fopen(RESOLVCONF, "r");
+	fp = fopen(RESOLV_CONF, "r");
 	/* XXX Use lwres resolv.conf reader */
 	if (fp == NULL)
 		goto no_file;
diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index fc96ef4b10..fc69c744af 100644
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.h,v 1.71 2001/08/08 22:54:15 gson Exp $ */
+/* $Id: dig.h,v 1.71.2.1 2001/10/04 22:03:42 gson Exp $ */
 
 #ifndef DIG_H
 #define DIG_H
@@ -40,7 +40,9 @@
 #define MXRD 32
 #define BUFSIZE 512
 #define COMMSIZE 0xffff
-#define RESOLVCONF "/etc/resolv.conf"
+#ifndef RESOLV_CONF
+#define RESOLV_CONF "/etc/resolv.conf"
+#endif
 #define OUTPUTBUF 32767
 #define MAXRRLIMIT 0xffffffff
 #define MAXTIMEOUT 0xffff