summaryrefslogtreecommitdiff
path: root/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2020-02-24 15:38:12 +0000
committerMathieu Arnold <mat@FreeBSD.org>2020-02-24 15:38:12 +0000
commit12b8caf42e66363ef7a1e8ce6742750adc9ae8b2 (patch)
tree588e5dabf02f85518162eac9c841e45890522b71 /dns/bind9-devel/files/extrapatch-bind-min-override-ttl
parentUpdate to v5.31.9-15-g34667d08d3 (diff)
Update to latest commit.
Notes
Notes: svn path=/head/; revision=526976
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 a9b3173cb7fd..7aaf6248e800 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-02-16 17:41:30 UTC
+--- bin/named/config.c.orig 2020-02-24 10:03:07 UTC
+++ bin/named/config.c
@@ -177,6 +177,7 @@ options {\n\
notify-source *;\n\
@@ -10,9 +10,9 @@ Add the override-cache-ttl feature.
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
---- bin/named/server.c.orig 2020-02-16 17:41:30 UTC
+--- bin/named/server.c.orig 2020-02-24 10:03:07 UTC
+++ bin/named/server.c
-@@ -4323,6 +4323,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4322,6 +4322,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
obj = NULL;
@@ -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-02-16 17:41:30 UTC
+--- lib/dns/include/dns/view.h.orig 2020-02-24 10:03:07 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-02-16 17:41:30 UTC
+--- lib/dns/resolver.c.orig 2020-02-24 10:03:07 UTC
+++ lib/dns/resolver.c
@@ -6233,6 +6233,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
}
@@ -49,7 +49,7 @@ Add the override-cache-ttl feature.
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2020-02-16 17:41:30 UTC
+--- lib/isccfg/namedconf.c.orig 2020-02-24 10:03:07 UTC
+++ lib/isccfg/namedconf.c
@@ -1990,6 +1990,7 @@ static cfg_clausedef_t view_clauses[] = {
#endif /* ifdef HAVE_LMDB */