aboutsummaryrefslogtreecommitdiff
path: root/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2018-09-10 10:29:20 +0000
committerMathieu Arnold <mat@FreeBSD.org>2018-09-10 10:29:20 +0000
commit847812242bec0c91b864c3cf94c50fd8a42fd806 (patch)
treee91a5b23823e99cf6c613fdc2ff2ccb8bb801a33 /dns/bind9-devel/files/extrapatch-bind-min-override-ttl
parent59dd2ec96a971a720a5de729f37cc6ce5b943ae4 (diff)
Notes
Diffstat (limited to 'dns/bind9-devel/files/extrapatch-bind-min-override-ttl')
-rw-r--r--dns/bind9-devel/files/extrapatch-bind-min-override-ttl12
1 files changed, 6 insertions, 6 deletions
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 81f5d835f41a..2e0a406c1b19 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-08-31 20:57:12 UTC
+--- bin/named/config.c.orig 2018-09-10 00:21:25 UTC
+++ bin/named/config.c
@@ -174,12 +174,14 @@ options {\n\
max-recursion-queries 75;\n\
@@ -15,7 +15,7 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
---- bin/named/server.c.orig 2018-08-31 20:57:12 UTC
+--- bin/named/server.c.orig 2018-09-10 00:21:25 UTC
+++ bin/named/server.c
@@ -4074,6 +4074,16 @@ configure_view(dns_view_t *view, dns_vie
}
@@ -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-08-31 20:57:12 UTC
+--- lib/dns/include/dns/view.h.orig 2018-09-10 00:21:25 UTC
+++ lib/dns/include/dns/view.h
@@ -153,6 +153,8 @@ struct dns_view {
bool requestnsid;
@@ -45,7 +45,7 @@
dns_ttl_t maxncachettl;
uint32_t nta_lifetime;
uint32_t nta_recheck;
---- lib/dns/resolver.c.orig 2018-08-31 20:57:12 UTC
+--- lib/dns/resolver.c.orig 2018-09-10 00:21:25 UTC
+++ lib/dns/resolver.c
@@ -5758,6 +5758,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
}
@@ -66,9 +66,9 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2018-08-31 20:57:12 UTC
+--- lib/isccfg/namedconf.c.orig 2018-09-10 00:21:25 UTC
+++ lib/isccfg/namedconf.c
-@@ -1919,6 +1919,8 @@ view_clauses[] = {
+@@ -1920,6 +1920,8 @@ view_clauses[] = {
{ "max-acache-size", &cfg_type_sizenodefault,
CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },