Rename cache_validated() to cache_not_validated().

Let's give the poor programmers a chance.
This commit is contained in:
Simon Kelley
2025-01-18 23:26:06 +00:00
parent 5bbea085d0
commit c221030f89

View File

@@ -1559,7 +1559,7 @@ static unsigned long crec_ttl(struct crec *crecp, time_t now)
return daemon->max_ttl; return daemon->max_ttl;
} }
static int cache_validated(const struct crec *crecp) static int cache_not_validated(const struct crec *crecp)
{ {
return (option_bool(OPT_DNSSEC_VALID) && !(crecp->flags & F_DNSSECOK)); return (option_bool(OPT_DNSSEC_VALID) && !(crecp->flags & F_DNSSECOK));
} }
@@ -1660,7 +1660,7 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
/* If the client asked for DNSSEC don't use cached data. */ /* If the client asked for DNSSEC don't use cached data. */
if ((crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG)) || if ((crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG)) ||
(rd_bit && (!do_bit || cache_validated(crecp)))) (rd_bit && (!do_bit || cache_not_validated(crecp))))
{ {
if (crecp->flags & F_CONFIG || qtype == T_CNAME) if (crecp->flags & F_CONFIG || qtype == T_CNAME)
ans = 1; ans = 1;
@@ -1819,7 +1819,7 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
the zone is unsigned, which implies that we're doing the zone is unsigned, which implies that we're doing
validation. */ validation. */
if ((crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG)) || if ((crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG)) ||
(rd_bit && (!do_bit || cache_validated(crecp)) )) (rd_bit && (!do_bit || cache_not_validated(crecp)) ))
{ {
do do
{ {
@@ -1975,7 +1975,7 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
/* If the client asked for DNSSEC don't use cached data. */ /* If the client asked for DNSSEC don't use cached data. */
if ((crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG)) || if ((crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG)) ||
(rd_bit && (!do_bit || cache_validated(crecp)) )) (rd_bit && (!do_bit || cache_not_validated(crecp)) ))
do do
{ {
int stale_flag = 0; int stale_flag = 0;
@@ -2169,7 +2169,7 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
rrtype = crecp->addr.rrdata.rrtype; rrtype = crecp->addr.rrdata.rrtype;
if (((flags & F_NXDOMAIN) || rrtype == qtype) && if (((flags & F_NXDOMAIN) || rrtype == qtype) &&
(!do_bit || cache_validated(crecp))) (!do_bit || cache_not_validated(crecp)))
{ {
char *rrdata = NULL; char *rrdata = NULL;
unsigned short rrlen = 0; unsigned short rrlen = 0;