1915. [bug] dig +ndots was broken. [RT #15215]

diff --git a/CHANGES b/CHANGES
index 0fd1ed0f32129cf908eedc461a35f109fd1f210d..2865dd8106c554de6766e52391393a2a9b0308f2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 
        --- 9.4.0a1 released ---
 
+1915.  [bug]           dig +ndots was broken. [RT #15215]
+
 1914.  [protocol]      DS is required to accept mnemonic algorithms
                        (RFC 4034).  Still emit numeric algorithms for
                        compatability with RFC 3658. [RT #15354]

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 4bc429e7959e6ad4f7d450efe1948a6dd4732458..b166d47e5eb08aad646e0da465dba493e018d4b0 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.24 2005/09/01 03:04:16 marka Exp $ */
+/* $Id: dighost.c,v 1.259.18.25 2005/09/09 00:24:39 marka Exp $ */
 
 /*! \file
  *  \note
@@ -970,8 +970,10 @@ setup_system(void) {
                }
        }
                        
-       ndots = lwconf->ndots;
-       debug("ndots is %d.", ndots);
+       if (ndots == -1) {
+               ndots = lwconf->ndots;
+               debug("ndots is %d.", ndots);
+       }
 
        /* If we don't find a nameserver fall back to localhost */
        if (lwconf->nsnext == 0) {