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

Wildcard matching was broken.

Browse Source
This commit is contained in:
Bob Halley
2000-02-02 21:22:09 +00:00
parent d2bb8318e5
commit 2d8ac40e14
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/dns/rbtdb.c
View File

@@ -1272,7 +1272,7 @@ find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep) {
dns_name_t *wname; dns_name_t *wname;
dns_fixedname_t fwname; dns_fixedname_t fwname;
dns_rbtdb_t *rbtdb; dns_rbtdb_t *rbtdb;
isc_boolean_t wild, active; isc_boolean_t done, wild, active;
/* /*
* Caller must be holding the tree lock and MUST NOT be holding * Caller must be holding the tree lock and MUST NOT be holding
@@ -1291,10 +1291,9 @@ find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep) {
rbtdb = search->rbtdb; rbtdb = search->rbtdb;
i = search->chain.level_matches; i = search->chain.level_matches;
while (i > 0) { done = ISC_FALSE;
i--; node = *nodep;
node = search->chain.levels[i]; do {
LOCK(&(rbtdb->node_locks[node->locknum].lock)); LOCK(&(rbtdb->node_locks[node->locknum].lock));
/* /*
@@ -1393,7 +1392,13 @@ find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep) {
result = DNS_R_NOTFOUND; result = DNS_R_NOTFOUND;
break; break;
} }
}
if (i > 0) {
i--;
node = search->chain.levels[i];
} else
done = ISC_TRUE;
} while (!done);
return (result); return (result);
} }
@@ -1829,7 +1834,7 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
if (empty_node) { if (empty_node) {
/* /*
* We have an exact match for the name, but there are no * We have an exact match for the name, but there are no
* active rdatasets the desired version. That means that * active rdatasets in the desired version. That means that
* this node doesn't exist in the desired version, and that * this node doesn't exist in the desired version, and that
* we really have a partial match. * we really have a partial match.
* *