summaryrefslogtreecommitdiff
path: root/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2019-07-08 14:22:51 +0000
committerMathieu Arnold <mat@FreeBSD.org>2019-07-08 14:22:51 +0000
commit25fe681a305c06bfa13015e4afa12dd20614bc51 (patch)
treea3ca892f280655ef0a6673fc3383353b2aa445fb /dns/bind9-devel/files/extrapatch-bind-min-override-ttl
parentUpdate to v5.31.1-138-g256dda502e. (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 19139f502104..4c420ccf7070 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 @@
---- bin/named/config.c.orig 2019-06-25 10:23:15 UTC
+--- bin/named/config.c.orig 2019-07-04 16:38:26 UTC
+++ bin/named/config.c
-@@ -172,6 +172,7 @@ options {\n\
+@@ -177,6 +177,7 @@ options {\n\
notify-source *;\n\
notify-source-v6 *;\n\
nsec3-test-zone no;\n\
@@ -8,7 +8,7 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
---- bin/named/server.c.orig 2019-06-25 10:23:15 UTC
+--- bin/named/server.c.orig 2019-07-04 16:38:26 UTC
+++ bin/named/server.c
@@ -4225,6 +4225,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-06-25 10:23:15 UTC
+--- lib/dns/include/dns/view.h.orig 2019-07-04 16:38:26 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-06-25 10:23:15 UTC
+--- lib/dns/resolver.c.orig 2019-07-04 16:38:26 UTC
+++ lib/dns/resolver.c
@@ -6048,6 +6048,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
}
@@ -47,9 +47,9 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2019-06-25 10:23:15 UTC
+--- lib/isccfg/namedconf.c.orig 2019-07-04 16:38:26 UTC
+++ lib/isccfg/namedconf.c
-@@ -1910,6 +1910,7 @@ view_clauses[] = {
+@@ -1911,6 +1911,7 @@ view_clauses[] = {
#endif
{ "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },