From cf0bcc2c80ca99f1e6e53dcdd0eba03fe70723df Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 8 Sep 2005 23:59:45 +0000 Subject: [PATCH] 1915. [bug] dig +ndots was broken. [RT #15215] --- CHANGES | 2 ++ bin/dig/dighost.c | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 1ed6f2b4c5..bde9363751 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +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 ee8792efd3..cbff565c68 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.284 2005/09/01 02:24:48 marka Exp $ */ +/* $Id: dighost.c,v 1.285 2005/09/08 23:59:45 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) {