From c2b2bd69faabd83143ffb30a132a2f20ebd9abda Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 2 Feb 2006 22:48:58 +0000
Subject: [PATCH] 1977.   [bug]           Silence noisy log message. [RT
 #15704]

---
 CHANGES           | 2 ++
 bin/named/query.c | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 61b8f3680e..f253708e09 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1977.	[bug]		Silence noisy log message. [RT #15704]
+
 1976.	[bug]		Handle systems with no IPv4 addresses. [RT #15695]
 
 1975.	[bug]		libbind: isc_gethexstring() could misparse multi-line
diff --git a/bin/named/query.c b/bin/named/query.c
index 09ebaf2723..e51ea3af66 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.279 2006/01/05 02:19:01 marka Exp $ */
+/* $Id: query.c,v 1.280 2006/02/02 22:48:58 marka Exp $ */
 
 /*! \file */
 
@@ -3444,7 +3444,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 	/*
 	 * First we must find the right database.
 	 */
-	options = 0;
+	options &= DNS_GETDB_NOLOG; /* Preserve DNS_GETDB_NOLOG. */
 	if (dns_rdatatype_atparent(qtype) &&
 	    !dns_name_equal(client->query.qname, dns_rootname))
 		options |= DNS_GETDB_NOEXACT;
@@ -3999,6 +3999,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 		query_maybeputqname(client);
 		client->query.qname = tname;
 		want_restart = ISC_TRUE;
+		if (!WANTRECURSION(client))
+			options |= DNS_GETDB_NOLOG;
 		goto addauth;
 	case DNS_R_DNAME:
 		/*
@@ -4116,6 +4118,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 		client->query.qname = fname;
 		fname = NULL;
 		want_restart = ISC_TRUE;
+		if (!WANTRECURSION(client))
+			options |= DNS_GETDB_NOLOG;
 		goto addauth;
 	default:
 		/*