- Fix NLnetLabs#174: NS Records below delegation are not ignored (nsd-checkzone

  also does not raise any issue).

Author: wcawijngaards

doc/ChangeLog

@@ -1,3 +1,7 @@
+6 May 2021: Wouter
+	- Fix #174: NS Records below delegation are not ignored (nsd-checkzone
+	  also does not raise any issue).
+
 4 May 2021: Wouter
 	- Fix SVCB sort call sizeof to be the size of the elements sorted.
 

doc/RELNOTES

@@ -9,6 +9,8 @@ BUG FIXES:
 	- Fix for #128: Skip over sendmmsg invalid argument when port is zero.
 	- Fix #171: Invalid negative response (NSEC3) after IXFR.
 	- Fix to make nsec3_chain_find_prev return NULL if one nsec3 left.
+	- Fix #174: NS Records below delegation are not ignored (nsd-checkzone
+	  also does not raise any issue).
 
 
 4.3.6

namedb.c

@@ -581,13 +581,18 @@ domain_find_parent_zone(namedb_type* db, zone_type* zone)
 domain_type *
 domain_find_ns_rrsets(domain_type* domain, zone_type* zone, rrset_type **ns)
 {
+	/* return highest NS RRset in the zone that is a delegation above */
+	domain_type* result = NULL;
 	while (domain && domain != zone->apex) {
 		*ns = domain_find_rrset(domain, zone, TYPE_NS);
 		if (*ns)
-			return domain;
+			result = domain;
 		domain = domain->parent;
 	}
 
+	if(result)
+		return result;
+
 	*ns = NULL;
 	return NULL;
 }