summaryrefslogtreecommitdiff
path: root/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2019-04-01 08:36:08 +0000
committerMathieu Arnold <mat@FreeBSD.org>2019-04-01 08:36:08 +0000
commit3afbf9d4719179d5b1f8ca54f91509754fa8599c (patch)
tree985dd8ec47385cc73f6c0e9734a49e52a8fe2851 /dns/bind9-devel/files/extrapatch-bind-min-override-ttl
parentUpdate to v5.29.9-51-g011b14198f. (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 04da72edb4e0..9c13ed1f9cf9 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-03-22 10:58:02 UTC
+--- bin/named/config.c.orig 2019-03-29 15:22:57 UTC
+++ bin/named/config.c
@@ -176,6 +176,7 @@ options {\n\
notify-source *;\n\
@@ -8,7 +8,7 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
---- bin/named/server.c.orig 2019-03-22 10:58:02 UTC
+--- bin/named/server.c.orig 2019-03-29 15:22:57 UTC
+++ bin/named/server.c
@@ -4231,6 +4231,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
@@ -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-03-22 10:58:02 UTC
+--- lib/dns/include/dns/view.h.orig 2019-03-29 15:22:57 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,7 @@ struct dns_view {
bool requestnsid;
@@ -32,9 +32,9 @@
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
---- lib/dns/resolver.c.orig 2019-03-22 10:58:02 UTC
+--- lib/dns/resolver.c.orig 2019-03-29 15:22:57 UTC
+++ lib/dns/resolver.c
-@@ -6008,6 +6008,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
+@@ -6011,6 +6011,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-03-22 10:58:02 UTC
+--- lib/isccfg/namedconf.c.orig 2019-03-29 15:22:57 UTC
+++ lib/isccfg/namedconf.c
@@ -1899,6 +1899,7 @@ view_clauses[] = {
#endif