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

diff --git a/CHANGES b/CHANGES
index 51402c726102e6ad195841832da23a5d1a5bb49c..5dd6bf16dd3ede322809484b0c630601f32b3422 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 
        --- 9.3.2b1 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 aa3d08fa24a47081766927c03369c938ba9f908a..83bc1f7bb35b7967239580744a5c9c12aa817763 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.221.2.19.2.29 2005/09/06 00:54:53 marka Exp $ */
+/* $Id: dighost.c,v 1.221.2.19.2.30 2005/09/09 00:29:10 marka Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -963,8 +963,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) {