upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-19 20:38:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle git commit -mifdef BIND9 case

Browse source
This commit is contained in:
Mark Andrews 2015-05-28 14:07:56 +10:00
parent 263a38f27b
commit 8167dedf5e
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/dns/view.c
View file

@ -1320,10 +1320,16 @@ dns_view_findzonecut2(dns_view_t *view, dns_name_t *name, dns_name_t *fname,
result = dns_db_findzonecut(db, name, options, now, NULL,
fname, rdataset, sigrdataset);
if (result == ISC_R_SUCCESS) {
#ifdef BIND9
if (zfname != NULL &&
(!dns_name_issubdomain(fname, zfname) ||
(dns_zone_gettype(zone) == dns_zone_staticstub &&
dns_name_equal(fname, zfname)))) {
dns_name_equal(fname, zfname))))
#else
if (zfname != NULL &&
!dns_name_issubdomain(fname, zfname))
#endif
{
/*
* We found a zonecut in the cache, but our
* zone delegation is better.