Tweaks to EDNS0 handling in DNS replies.

This commit is contained in:
Simon Kelley
2015-12-17 10:44:58 +00:00
parent 2dbba34b2c
commit dd4ad9ac7e
2 changed files with 43 additions and 36 deletions

View File

@@ -2129,18 +2129,16 @@ int dnssec_validate_reply(time_t now, struct dns_header *header, size_t plen, ch
/* Empty DS without NSECS */
if (qtype == T_DS)
return STAT_BOGUS;
else
rc = zone_status(name, qclass, keyname, now);
if (rc != STAT_SECURE)
{
rc = zone_status(name, qclass, keyname, now);
if (rc != STAT_SECURE)
{
if (class)
*class = qclass; /* Class for NEED_DS or NEED_DNSKEY */
return rc;
}
return STAT_BOGUS; /* signed zone, no NSECs */
}
if (class)
*class = qclass; /* Class for NEED_DS or NEED_DNSKEY */
return rc;
}
return STAT_BOGUS; /* signed zone, no NSECs */
}
if (nsec_type == T_NSEC)