summaryrefslogtreecommitdiff
path: root/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2019-12-09 14:10:35 +0000
committerMathieu Arnold <mat@FreeBSD.org>2019-12-09 14:10:35 +0000
commite27d8ba87e22705a9a036046e9214b763485be15 (patch)
treed54d63c05eca38c131215720c4c877360f694d60 /dns/bind9-devel/files/extrapatch-bind-min-override-ttl
parentUpdate to v5.31.6-115-gd821b3b405. (diff)
Update to latest commit.
Diffstat (limited to 'dns/bind9-devel/files/extrapatch-bind-min-override-ttl')
-rw-r--r--dns/bind9-devel/files/extrapatch-bind-min-override-ttl14
1 files changed, 7 insertions, 7 deletions
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 4f9720e083ab..1a7eacbb9cfd 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 2019-11-12 11:24:41 UTC
+--- bin/named/config.c.orig 2019-12-09 08:22:56 UTC
+++ bin/named/config.c
@@ -178,6 +178,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 2019-11-12 11:24:41 UTC
+--- bin/named/server.c.orig 2019-12-09 08:22:56 UTC
+++ bin/named/server.c
-@@ -4219,6 +4219,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4354,6 +4354,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 2019-11-12 11:24:41 UTC
+--- lib/dns/include/dns/view.h.orig 2019-12-09 08:22:56 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,7 @@ struct dns_view {
bool requestnsid;
@@ -34,9 +34,9 @@ Add the override-cache-ttl feature.
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
---- lib/dns/resolver.c.orig 2019-11-12 11:24:41 UTC
+--- lib/dns/resolver.c.orig 2019-12-09 08:22:56 UTC
+++ lib/dns/resolver.c
-@@ -6056,6 +6056,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
+@@ -6031,6 +6031,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 2019-11-12 11:24:41 UTC
+--- lib/isccfg/namedconf.c.orig 2019-12-09 08:22:56 UTC
+++ lib/isccfg/namedconf.c
@@ -1980,6 +1980,7 @@ view_clauses[] = {
#endif