summaryrefslogtreecommitdiff
path: root/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2020-02-11 14:14:54 +0000
committerMathieu Arnold <mat@FreeBSD.org>2020-02-11 14:14:54 +0000
commit8f17b20df81a3f049a401a5ee90d707cd5949808 (patch)
tree3cfdeba7994740dcb293c86d00aa6ff01219f501 /dns/bind9-devel/files/extrapatch-bind-min-override-ttl
parentUpdate to v5.31.8-135-gd34b46d077. (diff)
Update to latest commit.
While there, run portfmt.
Notes
Notes: svn path=/head/; revision=525822
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 e7abd53b1d69..2f95f8d3a5a9 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 @@
Add the override-cache-ttl feature.
---- bin/named/config.c.orig 2020-01-16 07:41:10 UTC
+--- bin/named/config.c.orig 2020-02-11 10:42:52 UTC
+++ bin/named/config.c
@@ -178,6 +178,7 @@ options {\n\
notify-source *;\n\
@@ -10,7 +10,7 @@ Add the override-cache-ttl feature.
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
---- bin/named/server.c.orig 2020-01-16 07:41:10 UTC
+--- bin/named/server.c.orig 2020-02-11 10:42:52 UTC
+++ bin/named/server.c
@@ -4303,6 +4303,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
@@ -24,7 +24,7 @@ Add the override-cache-ttl feature.
result = named_config_get(maps, "max-cache-ttl", &obj);
INSIST(result == ISC_R_SUCCESS);
view->maxcachettl = cfg_obj_asduration(obj);
---- lib/dns/include/dns/view.h.orig 2020-01-16 07:41:10 UTC
+--- lib/dns/include/dns/view.h.orig 2020-02-11 10:42:52 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,7 @@ struct dns_view {
bool requestnsid;
@@ -34,7 +34,7 @@ Add the override-cache-ttl feature.
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
---- lib/dns/resolver.c.orig 2020-01-16 07:41:10 UTC
+--- lib/dns/resolver.c.orig 2020-02-11 10:42:52 UTC
+++ lib/dns/resolver.c
@@ -6032,6 +6032,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
}
@@ -49,9 +49,9 @@ Add the override-cache-ttl feature.
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2020-01-16 07:41:10 UTC
+--- lib/isccfg/namedconf.c.orig 2020-02-11 10:42:52 UTC
+++ lib/isccfg/namedconf.c
-@@ -1980,6 +1980,7 @@ view_clauses[] = {
+@@ -2003,6 +2003,7 @@ view_clauses[] = {
#endif
{ "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },