aboutsummaryrefslogtreecommitdiff
path: root/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
Diffstat (limited to 'dns/bind9-devel/files/extrapatch-bind-min-override-ttl')
-rw-r--r--dns/bind9-devel/files/extrapatch-bind-min-override-ttl14
1 files changed, 7 insertions, 7 deletions
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 4eba563b458a..13433158014c 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,4 +1,4 @@
---- bin/named/config.c.orig 2018-10-24 02:49:29 UTC
+--- bin/named/config.c.orig 2018-10-31 13:26:42 UTC
+++ bin/named/config.c
@@ -174,12 +174,14 @@ options {\n\
max-recursion-queries 75;\n\
@@ -15,9 +15,9 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
---- bin/named/server.c.orig 2018-10-24 02:49:29 UTC
+--- bin/named/server.c.orig 2018-10-31 13:26:42 UTC
+++ bin/named/server.c
-@@ -4102,6 +4102,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -4101,6 +4101,16 @@ configure_view(dns_view_t *view, dns_vie
}
obj = NULL;
@@ -34,7 +34,7 @@
result = named_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 2018-10-24 02:49:29 UTC
+--- lib/dns/include/dns/view.h.orig 2018-10-31 13:26:42 UTC
+++ lib/dns/include/dns/view.h
@@ -153,6 +153,8 @@ struct dns_view {
bool requestnsid;
@@ -45,9 +45,9 @@
dns_ttl_t maxncachettl;
uint32_t nta_lifetime;
uint32_t nta_recheck;
---- lib/dns/resolver.c.orig 2018-10-24 02:49:29 UTC
+--- lib/dns/resolver.c.orig 2018-10-31 13:26:42 UTC
+++ lib/dns/resolver.c
-@@ -5936,6 +5936,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
+@@ -5926,6 +5926,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
}
/*
@@ -66,7 +66,7 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2018-10-24 02:49:29 UTC
+--- lib/isccfg/namedconf.c.orig 2018-10-31 13:26:42 UTC
+++ lib/isccfg/namedconf.c
@@ -1921,6 +1921,8 @@ view_clauses[] = {
{ "max-acache-size", &cfg_type_sizenodefault,