1977. [bug] Silence noisy log message. [RT #15704]

diff --git a/CHANGES b/CHANGES
index 61b8f3680eff0e44b231d65e32b190540bdfcef0..f253708e09adde4d9b0a9155f3128da8dd55a3e0 100644 (file)
--- 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 09ebaf2723373c9f1d413cd3efe0ecb61396617c..e51ea3af6660c0bfa6a1fe81abe6ca10b30e1767 100644 (file)
--- 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:
                /*