pullup:

1028.   [bug]           On Win32, dig/host/nslookup looked for resolv.conf
                        in the wrong directory. [RT #1833]

diff --git a/CHANGES b/CHANGES
index 5defbfe044dbdd45ecfa892952217de30fb6d8f7..1d0697b23df2d1766a6b92e64e4d1f87acbdf3e0 100644 (file)
--- 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 a0b19e8bb56708a6b223c89c458e8b3d0f889a3f..a8786867228f21bd8e4d1de5408dcd942e903335 100644 (file)
--- 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 fc96ef4b10cdc0676c8301df864584136f04fa40..fc69c744afe08bc104d050f5679f8b913eb3d92f 100644 (file)
--- 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