summaryrefslogtreecommitdiff
path: root/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2019-07-22 14:14:01 +0000
committerMathieu Arnold <mat@FreeBSD.org>2019-07-22 14:14:01 +0000
commit5514cdf8bca4d73d7944115883c83455d2a948f5 (patch)
tree4a06d9e1267051ed5d023aeba99f94cfa75c53b6 /dns/bind9-devel/files/extrapatch-bind-min-override-ttl
parentUpdate to v5.31.2-21-g996b0cb8b8 (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-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 4c420ccf7070..e0ff637c2dbb 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,4 +1,4 @@
---- bin/named/config.c.orig 2019-07-04 16:38:26 UTC
+--- bin/named/config.c.orig 2019-07-22 02:18:48 UTC
+++ bin/named/config.c
@@ -177,6 +177,7 @@ options {\n\
notify-source *;\n\
@@ -8,9 +8,9 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
---- bin/named/server.c.orig 2019-07-04 16:38:26 UTC
+--- bin/named/server.c.orig 2019-07-22 02:18:48 UTC
+++ bin/named/server.c
-@@ -4225,6 +4225,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4226,6 +4226,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
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 2019-07-04 16:38:26 UTC
+--- lib/dns/include/dns/view.h.orig 2019-07-22 02:18:48 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,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 2019-07-04 16:38:26 UTC
+--- lib/dns/resolver.c.orig 2019-07-22 02:18:48 UTC
+++ lib/dns/resolver.c
@@ -6048,6 +6048,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
}
@@ -47,7 +47,7 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2019-07-04 16:38:26 UTC
+--- lib/isccfg/namedconf.c.orig 2019-07-22 02:18:48 UTC
+++ lib/isccfg/namedconf.c
@@ -1911,6 +1911,7 @@ view_clauses[] = {
#endif