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

                        [RT #19852]

diff --git a/CHANGES b/CHANGES
index 7ffe4f9ee1b9503e161f2067cc612991cfd3d616..7a69c19284fb492fcc347143f0b4c7650c4b1fb8 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 4402e47e0937dcd0152d3bbe2c35a9783cf71c09..295a0f3b63637982f59ecfcbcc1111476f82fc89 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.321 2009/02/25 02:34:21 marka Exp $ */
+/* $Id: dighost.c,v 1.322 2009/06/24 02:51:29 marka Exp $ */
 
 /*! \file
  *  \note
@@ -1066,7 +1066,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)) {