- Fix that cachedb does not warn when serve-expired is disabled about

use of serve-expired-reply-ttl and serve-expired-client-timeout.
NLnetLabs · Oct 11, 2023 · f2528dc · f2528dc
1 parent d5954af
commit f2528dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/cachedb/cachedb.c b/cachedb/cachedb.c
@@ -265,11 +265,11 @@ cachedb_init(struct module_env* env, int id)
 		return 0;
 	}
 	cachedb_env->enabled = 1;
-	if(env->cfg->serve_expired_reply_ttl)
+	if(env->cfg->serve_expired && env->cfg->serve_expired_reply_ttl)
 		log_warn(
 			"cachedb: serve-expired-reply-ttl is set but not working for data "
-			"originating from the external cache; 0 TLL is used for those.");
-	if(env->cfg->serve_expired_client_timeout)
+			"originating from the external cache; 0 TTL is used for those.");
+	if(env->cfg->serve_expired && env->cfg->serve_expired_client_timeout)
 		log_warn(
 			"cachedb: serve-expired-client-timeout is set but not working for "
 			"data originating from the external cache; expired data are used "

diff --git a/doc/Changelog b/doc/Changelog
@@ -4,6 +4,8 @@
 
 11 October 2023: Wouter
 	- Fix #949: "could not create control compt".
+	- Fix that cachedb does not warn when serve-expired is disabled about
+	  use of serve-expired-reply-ttl and serve-expired-client-timeout.
 
 10 October 2023: George
 	- Fix infinite loop when reading multiple lines of input on a broken