Commit c2b2bd69 authored by Mark Andrews's avatar Mark Andrews
Browse files

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

parent d140ae28
1977. [bug] Silence noisy log message. [RT #15704]
1976. [bug] Handle systems with no IPv4 addresses. [RT #15695] 1976. [bug] Handle systems with no IPv4 addresses. [RT #15695]
1975. [bug] libbind: isc_gethexstring() could misparse multi-line 1975. [bug] libbind: isc_gethexstring() could misparse multi-line
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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 */ /*! \file */
...@@ -3444,7 +3444,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) ...@@ -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. * First we must find the right database.
*/ */
options = 0; options &= DNS_GETDB_NOLOG; /* Preserve DNS_GETDB_NOLOG. */
if (dns_rdatatype_atparent(qtype) && if (dns_rdatatype_atparent(qtype) &&
!dns_name_equal(client->query.qname, dns_rootname)) !dns_name_equal(client->query.qname, dns_rootname))
options |= DNS_GETDB_NOEXACT; options |= DNS_GETDB_NOEXACT;
...@@ -3999,6 +3999,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) ...@@ -3999,6 +3999,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
query_maybeputqname(client); query_maybeputqname(client);
client->query.qname = tname; client->query.qname = tname;
want_restart = ISC_TRUE; want_restart = ISC_TRUE;
if (!WANTRECURSION(client))
options |= DNS_GETDB_NOLOG;
goto addauth; goto addauth;
case DNS_R_DNAME: case DNS_R_DNAME:
/* /*
...@@ -4116,6 +4118,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype) ...@@ -4116,6 +4118,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
client->query.qname = fname; client->query.qname = fname;
fname = NULL; fname = NULL;
want_restart = ISC_TRUE; want_restart = ISC_TRUE;
if (!WANTRECURSION(client))
options |= DNS_GETDB_NOLOG;
goto addauth; goto addauth;
default: default:
/* /*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment