Small fixes from Wouter's review

diff --git a/services/cache/dns.c b/services/cache/dns.c
index 1a4fbdd2f824737b69ff2c7cdb91053b726805bd..9fbcb5f0ffc1ff6ef7d46ed309dce399c2f9b253 100644 (file)
--- a/services/cache/dns.c
+++ b/services/cache/dns.c
@@ -178,7 +178,7 @@ dns_cache_store_msg(struct module_env* env, struct query_info* qinfo,
                 * which could be useful for delegation information */
                verbose(VERB_ALGO, "TTL 0: dropped msg from cache");
                free(rep);
-               /* if the message is in then cache, remove that msg,
+               /* if the message is in the cache, remove that msg,
                 * so that the TTL 0 response can be returned for future
                 * responses (i.e. don't get answered from
                 * cache, but instead go to recursion to get this TTL0

diff --git a/testdata/serve_expired_0ttl_nodata.rpl b/testdata/serve_expired_0ttl_nodata.rpl
index e28e3525580a181a6993274616df1b1325c86665..45b51444bccd8df852690064380b1b7ad20ca15b 100644 (file)
--- a/testdata/serve_expired_0ttl_nodata.rpl
+++ b/testdata/serve_expired_0ttl_nodata.rpl
@@ -17,7 +17,7 @@ CONFIG_END
 SCENARIO_BEGIN Test serve-expired with NXDOMAIN followed by 0 TTL
 ; Scenario overview:
 ; - query for 0ttl.example.com. IN A
-; - answer from upstream is NODATA; will be cached for NORR_TTL(5)
+; - answer from upstream is NODATA; will be cached for the SOA negative TTL.
 ; - check that the client gets the NODATA; also cached
 ; - query again right after the TTL expired
 ; - this time the server answers with a 0 TTL RRset

diff --git a/testdata/serve_expired_0ttl_nxdomain.rpl b/testdata/serve_expired_0ttl_nxdomain.rpl
index 55b7605adb27380489c64d29e80b9cb3fea6c2a8..0fcde9f2ddb627d7d2ab18ed1c053c86f4b698d5 100644 (file)
--- a/testdata/serve_expired_0ttl_nxdomain.rpl
+++ b/testdata/serve_expired_0ttl_nxdomain.rpl
@@ -17,7 +17,7 @@ CONFIG_END
 SCENARIO_BEGIN Test serve-expired with NXDOMAIN followed by 0 TTL
 ; Scenario overview:
 ; - query for 0ttl.example.com. IN A
-; - answer from upstream is NXDOMAIN; will be cached for NORR_TTL(5)
+; - answer from upstream is NXDOMAIN; will be cached for the SOA negative TTL.
 ; - check that the client gets the NXDOMAIN; also cached
 ; - query again right after the TTL expired
 ; - this time the server answers with a 0 TTL RRset