2616. [bug] The nameserver argument to 'host' was being ignored.

                        [RT #19852]

diff --git a/CHANGES b/CHANGES
index fe7f345003bda7d02b7195800fe93149364d99e0..665d1a5e79bdc850af483f1a579e153f79345fbf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2616.  [bug]           The nameserver argument to 'host' was being ignored.
+                       [RT #19852]
+
 2615.  [bug]           "__attribute__((unused))" was in the wrong place
                        for ia64 gcc builds. [RT #19854]
 

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 2d5551f6186e300831b1aeeea23505fe697e3333..a06c90a3db909d1a77ca362f80c1d0744726848b 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.259.18.57 2009/02/25 02:42:57 marka Exp $ */
+/* $Id: dighost.c,v 1.259.18.58 2009/06/24 03:44:52 marka Exp $ */
 
 /*! \file
  *  \note
@@ -1046,7 +1046,9 @@ setup_system(void) {
                debug("ndots is %d.", ndots);
        }
 
-       copy_server_list(lwconf, &server_list);
+       /* If user doesn't specify server use nameservers from resolv.conf. */
+       if (ISC_LIST_EMPTY(server_list))
+               copy_server_list(lwconf, &server_list);
 
        /* If we don't find a nameserver fall back to localhost */
        if (ISC_LIST_EMPTY(server_list)) {