aboutsummaryrefslogtreecommitdiffstats
path: root/dns/bind99/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
Diffstat (limited to 'dns/bind99/files/extrapatch-bind-min-override-ttl')
-rw-r--r--dns/bind99/files/extrapatch-bind-min-override-ttl12
1 files changed, 6 insertions, 6 deletions
diff --git a/dns/bind99/files/extrapatch-bind-min-override-ttl b/dns/bind99/files/extrapatch-bind-min-override-ttl
index 269cb59b74f..1492257ce5b 100644
--- a/dns/bind99/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind99/files/extrapatch-bind-min-override-ttl
@@ -1,4 +1,4 @@
---- bin/named/config.c.orig 2015-09-09 02:23:50 UTC
+--- bin/named/config.c.orig 2016-02-29 00:30:52 UTC
+++ bin/named/config.c
@@ -141,6 +141,8 @@ options {\n\
min-roots 2;\n\
@@ -9,7 +9,7 @@
max-cache-ttl 604800; /* 1 week */\n\
transfer-format many-answers;\n\
max-cache-size 0;\n\
---- bin/named/server.c.orig 2015-09-09 02:23:50 UTC
+--- bin/named/server.c.orig 2016-02-29 00:30:52 UTC
+++ bin/named/server.c
@@ -2554,6 +2554,16 @@ configure_view(dns_view_t *view, cfg_obj
}
@@ -28,7 +28,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 2015-09-09 02:23:50 UTC
+--- lib/dns/include/dns/view.h.orig 2016-02-29 00:30:52 UTC
+++ lib/dns/include/dns/view.h
@@ -148,6 +148,8 @@ struct dns_view {
isc_boolean_t provideixfr;
@@ -39,9 +39,9 @@
dns_ttl_t maxncachettl;
in_port_t dstport;
dns_aclenv_t aclenv;
---- lib/dns/resolver.c.orig 2015-09-09 02:23:50 UTC
+--- lib/dns/resolver.c.orig 2016-02-29 00:30:52 UTC
+++ lib/dns/resolver.c
-@@ -5086,6 +5086,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
+@@ -5088,6 +5088,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
}
/*
@@ -60,7 +60,7 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl)
---- lib/isccfg/namedconf.c.orig 2015-09-09 02:23:50 UTC
+--- lib/isccfg/namedconf.c.orig 2016-02-29 00:30:52 UTC
+++ lib/isccfg/namedconf.c
@@ -1448,6 +1448,8 @@ view_clauses[] = {
{ "lame-ttl", &cfg_type_uint32, 0 },