aboutsummaryrefslogtreecommitdiff
path: root/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2018-12-10 13:39:55 +0000
committerMathieu Arnold <mat@FreeBSD.org>2018-12-10 13:39:55 +0000
commit4dc8511880bce0d96818d93e971a0c2b457b3520 (patch)
tree0d927d23c2d537aafe0d129eb3b0117bd1f91ffa /dns/bind9-devel/files/extrapatch-bind-min-override-ttl
parentd58529243647616349393995b5e57c8e5e709c41 (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-ttl16
1 files changed, 8 insertions, 8 deletions
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index d1f84cd708c9..5553edc32ab0 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,6 +1,6 @@
---- bin/named/config.c.orig 2018-12-04 09:57:38 UTC
+--- bin/named/config.c.orig 2018-12-10 05:51:06 UTC
+++ bin/named/config.c
-@@ -182,6 +182,7 @@ options {\n\
+@@ -179,6 +179,7 @@ options {\n\
notify-source *;\n\
notify-source-v6 *;\n\
nsec3-test-zone no;\n\
@@ -8,9 +8,9 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
---- bin/named/server.c.orig 2018-12-04 09:57:38 UTC
+--- bin/named/server.c.orig 2018-12-10 05:51:06 UTC
+++ bin/named/server.c
-@@ -4124,6 +4124,11 @@ configure_view(dns_view_t *view, dns_vie
+@@ -4154,6 +4154,11 @@ configure_view(dns_view_t *view, dns_vie
}
obj = NULL;
@@ -22,7 +22,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-12-04 09:57:38 UTC
+--- lib/dns/include/dns/view.h.orig 2018-12-10 05:51:06 UTC
+++ lib/dns/include/dns/view.h
@@ -153,6 +153,7 @@ struct dns_view {
bool requestnsid;
@@ -32,7 +32,7 @@
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
---- lib/dns/resolver.c.orig 2018-12-04 09:57:38 UTC
+--- lib/dns/resolver.c.orig 2018-12-10 05:51:06 UTC
+++ lib/dns/resolver.c
@@ -5967,6 +5967,12 @@ cache_name(fetchctx_t *fctx, dns_name_t
}
@@ -47,9 +47,9 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2018-12-04 09:57:38 UTC
+--- lib/isccfg/namedconf.c.orig 2018-12-10 05:51:06 UTC
+++ lib/isccfg/namedconf.c
-@@ -1921,6 +1921,7 @@ view_clauses[] = {
+@@ -1900,6 +1900,7 @@ view_clauses[] = {
{ "max-acache-size", &cfg_type_sizenodefault,
CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },