From c221030f8967e519ea215d91fad8bb3cbe9cbc7a Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Sat, 18 Jan 2025 23:26:06 +0000 Subject: [PATCH] Rename cache_validated() to cache_not_validated(). Let's give the poor programmers a chance. --- src/rfc1035.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rfc1035.c b/src/rfc1035.c index b62a342..d669e6a 100644 --- a/src/rfc1035.c +++ b/src/rfc1035.c @@ -1559,7 +1559,7 @@ static unsigned long crec_ttl(struct crec *crecp, time_t now) 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)); } @@ -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 ((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) 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 validation. */ 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 { @@ -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 ((crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG)) || - (rd_bit && (!do_bit || cache_validated(crecp)) )) + (rd_bit && (!do_bit || cache_not_validated(crecp)) )) do { 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; if (((flags & F_NXDOMAIN) || rrtype == qtype) && - (!do_bit || cache_validated(crecp))) + (!do_bit || cache_not_validated(crecp))) { char *rrdata = NULL; unsigned short rrlen = 0;