2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00

the sdb returned the wrong answer when querying for dnames below other dnames

and ANY queries at delegation points.
This commit is contained in:
Brian Wellington
2001-03-17 02:52:29 +00:00
parent 80b3f47796
commit c302b021cc

View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: sdb.c,v 1.28 2001/02/20 23:20:44 bwelling Exp $ */ /* $Id: sdb.c,v 1.29 2001/03/17 02:52:29 bwelling Exp $ */
#include <config.h> #include <config.h>
@@ -723,7 +723,6 @@ find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
REQUIRE(version == NULL || version == (void *) &dummy); REQUIRE(version == NULL || version == (void *) &dummy);
UNUSED(options); UNUSED(options);
UNUSED(sigrdataset);
UNUSED(sdb); UNUSED(sdb);
if (!dns_name_issubdomain(name, &db->origin)) if (!dns_name_issubdomain(name, &db->origin))
@@ -767,8 +766,7 @@ find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
dns_rdatatype_dname, dns_rdatatype_dname,
0, now, rdataset, sigrdataset); 0, now, rdataset, sigrdataset);
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
if (type != dns_rdatatype_dname) result = DNS_R_DNAME;
result = DNS_R_DNAME;
break; break;
} }
} }
@@ -782,7 +780,14 @@ find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
dns_rdatatype_ns, dns_rdatatype_ns,
0, now, rdataset, sigrdataset); 0, now, rdataset, sigrdataset);
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
if (type != dns_rdatatype_ns) if (i == nlabels && type == dns_rdatatype_any)
{
result = DNS_R_ZONECUT;
dns_rdataset_disassociate(rdataset);
if (sigrdataset != NULL)
dns_rdataset_disassociate
(sigrdataset);
} else
result = DNS_R_DELEGATION; result = DNS_R_DELEGATION;
break; break;
} }