Rationalise --server parsing and datastructure building.

Use add_update_server for everything.
This commit is contained in:
Simon Kelley
2021-06-25 22:09:08 +01:00
parent 1b30fd1732
commit 85bc7534da
8 changed files with 231 additions and 284 deletions

View File

@@ -1005,12 +1005,14 @@ unsigned int extract_request(struct dns_header *header, size_t qlen, char *name,
return F_IPV4 | F_IPV6;
}
#ifdef HAVE_DNSSEC
/* F_DNSSECOK as agument to search_servers() inhibits forwarding
to servers for domains without a trust anchor. This make the
behaviour for DS and DNSKEY queries we forward the same
as for DS and DNSKEY queries we originate. */
if (qtype == T_DS || qtype == T_DNSKEY)
if (option_bool(OPT_DNSSEC_VALID) && (qtype == T_DS || qtype == T_DNSKEY))
return F_DNSSECOK;
#endif
return F_QUERY;
}