aboutsummaryrefslogtreecommitdiff
path: root/dns/bind911/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
Diffstat (limited to 'dns/bind911/files/extrapatch-bind-min-override-ttl')
-rw-r--r--dns/bind911/files/extrapatch-bind-min-override-ttl12
1 files changed, 6 insertions, 6 deletions
diff --git a/dns/bind911/files/extrapatch-bind-min-override-ttl b/dns/bind911/files/extrapatch-bind-min-override-ttl
index 815ee5d1f108..2b11ce61b331 100644
--- a/dns/bind911/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind911/files/extrapatch-bind-min-override-ttl
@@ -1,7 +1,7 @@
- Add the min-cache-ttl config knob.
- Add the override-cache-ttl config knob.
---- bin/named/config.c.orig 2020-10-13 11:00:08 UTC
+--- bin/named/config.c.orig 2020-12-08 08:36:42 UTC
+++ bin/named/config.c
@@ -182,6 +182,8 @@ options {\n\
" max-acache-size 16M;\n\
@@ -12,7 +12,7 @@
max-clients-per-query 100;\n\
max-ncache-ttl 10800; /* 3 hours */\n\
max-recursion-depth 7;\n\
---- bin/named/server.c.orig 2020-10-13 11:00:08 UTC
+--- bin/named/server.c.orig 2020-12-08 08:36:42 UTC
+++ bin/named/server.c
@@ -3720,6 +3720,16 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
@@ -31,7 +31,7 @@
result = ns_config_get(maps, "max-cache-ttl", &obj);
INSIST(result == ISC_R_SUCCESS);
view->maxcachettl = cfg_obj_asuint32(obj);
---- lib/dns/include/dns/view.h.orig 2020-10-13 11:00:08 UTC
+--- lib/dns/include/dns/view.h.orig 2020-12-08 08:36:42 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,8 @@ struct dns_view {
bool requestnsid;
@@ -42,9 +42,9 @@
dns_ttl_t maxncachettl;
uint32_t nta_lifetime;
uint32_t nta_recheck;
---- lib/dns/resolver.c.orig 2020-10-13 11:00:08 UTC
+--- lib/dns/resolver.c.orig 2020-12-08 08:36:42 UTC
+++ lib/dns/resolver.c
-@@ -5572,6 +5572,18 @@ cache_name(fetchctx_t *fctx, dns_message_t *rmessage,
+@@ -5579,6 +5579,18 @@ cache_name(fetchctx_t *fctx, dns_message_t *rmessage,
}
/*
@@ -63,7 +63,7 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2020-10-13 11:00:08 UTC
+--- lib/isccfg/namedconf.c.orig 2020-12-08 08:36:42 UTC
+++ lib/isccfg/namedconf.c
@@ -1773,6 +1773,8 @@ view_clauses[] = {
#endif