mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 07:35:26 +00:00
Code Issues Releases Wiki Activity

2953. [bug] Silence spurious "expected covering NSEC3, got an

Browse Source 
exact match" message when returning a wildcard
                        no data response. [RT #21744]
This commit is contained in:
Mark Andrews
2010-09-07 02:28:17 +00:00
parent 8bf7aca489
commit 8fb412590e
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,3 +1,7 @@
2953. [bug] Silence spurious "expected covering NSEC3, got an
exact match" message when returning a wildcard
no data response. [RT #21744]
2952. [port] win32: named-checkzone and named-checkconf failed 2952. [port] win32: named-checkzone and named-checkconf failed
to initialise winsock. [RT #21932] to initialise winsock. [RT #21932]

15
bin/named/query.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: query.c,v 1.343 2010/07/15 01:17:45 jinmei Exp $ */ /* $Id: query.c,v 1.344 2010/09/07 02:28:17 marka Exp $ */
/*! \file */ /*! \file */
@@ -2799,7 +2799,7 @@ query_addds(ns_client_t *client, dns_db_t *db, dns_dbnode_t *node,
static void static void
query_addwildcardproof(ns_client_t *client, dns_db_t *db, query_addwildcardproof(ns_client_t *client, dns_db_t *db,
dns_dbversion_t *version, dns_name_t *name, dns_dbversion_t *version, dns_name_t *name,
isc_boolean_t ispositive) isc_boolean_t ispositive, isc_boolean_t nodata)
{ {
isc_buffer_t *dbuf, b; isc_buffer_t *dbuf, b;
dns_name_t *fname; dns_name_t *fname;
@@ -2987,7 +2987,7 @@ query_addwildcardproof(ns_client_t *client, dns_db_t *db,
goto cleanup; goto cleanup;
query_findclosestnsec3(wname, db, NULL, client, rdataset, query_findclosestnsec3(wname, db, NULL, client, rdataset,
sigrdataset, fname, ISC_FALSE, NULL); sigrdataset, fname, nodata, NULL);
if (!dns_rdataset_isassociated(rdataset)) if (!dns_rdataset_isassociated(rdataset))
goto cleanup; goto cleanup;
query_addrrset(client, &fname, &rdataset, &sigrdataset, query_addrrset(client, &fname, &rdataset, &sigrdataset,
@@ -3090,7 +3090,7 @@ query_addnxrrsetnsec(ns_client_t *client, dns_db_t *db,
/* XXX */ /* XXX */
query_addwildcardproof(client, db, version, client->query.qname, query_addwildcardproof(client, db, version, client->query.qname,
ISC_TRUE); ISC_TRUE, ISC_FALSE);
/* /*
* We'll need some resources... * We'll need some resources...
@@ -4330,7 +4330,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
query_releasename(client, &fname); query_releasename(client, &fname);
query_addwildcardproof(client, db, version, query_addwildcardproof(client, db, version,
client->query.qname, client->query.qname,
ISC_FALSE); ISC_FALSE, ISC_TRUE);
} }
} }
if (dns_rdataset_isassociated(rdataset)) { if (dns_rdataset_isassociated(rdataset)) {
@@ -4419,7 +4419,8 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
&sigrdataset, &sigrdataset,
NULL, DNS_SECTION_AUTHORITY); NULL, DNS_SECTION_AUTHORITY);
query_addwildcardproof(client, db, version, query_addwildcardproof(client, db, version,
client->query.qname, ISC_FALSE); client->query.qname, ISC_FALSE,
ISC_FALSE);
} }
/* /*
@@ -4992,7 +4993,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
if (need_wildcardproof && dns_db_issecure(db)) if (need_wildcardproof && dns_db_issecure(db))
query_addwildcardproof(client, db, version, query_addwildcardproof(client, db, version,
dns_fixedname_name(&wildcardname), dns_fixedname_name(&wildcardname),
ISC_TRUE); ISC_TRUE, ISC_FALSE);
cleanup: cleanup:
CTRACE("query_find: cleanup"); CTRACE("query_find: cleanup");
/* /*