diff options
| author | Philip Paeps <philip@FreeBSD.org> | 2020-06-18 08:29:57 +0000 |
|---|---|---|
| committer | Philip Paeps <philip@FreeBSD.org> | 2020-06-18 08:29:57 +0000 |
| commit | f2d0e1387a4dd182cf2256c37e5fb2ceefa4c1c5 (patch) | |
| tree | 60c3f9d7a790142011ff002f48b1cf182eea4523 /dns/bind911/files/extrapatch-bind-min-override-ttl | |
| parent | 2ce1da89d55a71b04d09161703bd92671c59bbf0 (diff) | |
| download | ports-f2d0e1387a4dd182cf2256c37e5fb2ceefa4c1c5.tar.gz ports-f2d0e1387a4dd182cf2256c37e5fb2ceefa4c1c5.zip | |
MFH: r539519
dns/bind911: update to 9.11.20.
Security: CVE-2020-8619
Submitted by: mat (maintainer)
Approved by: ports-secteam (joneum)
Notes
Notes:
svn path=/branches/2020Q2/; revision=539535
Diffstat (limited to 'dns/bind911/files/extrapatch-bind-min-override-ttl')
| -rw-r--r-- | dns/bind911/files/extrapatch-bind-min-override-ttl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dns/bind911/files/extrapatch-bind-min-override-ttl b/dns/bind911/files/extrapatch-bind-min-override-ttl index 426c1c462368..3bf0b96f66a3 100644 --- a/dns/bind911/files/extrapatch-bind-min-override-ttl +++ b/dns/bind911/files/extrapatch-bind-min-override-ttl @@ -1,7 +1,7 @@ - Add the min-cache-ttl config knob. - Add the override-cache-ttl config knob. ---- bin/named/config.c.orig 2020-05-06 12:50:24 UTC +--- bin/named/config.c.orig 2020-06-10 18:00:37 UTC +++ bin/named/config.c @@ -182,6 +182,8 @@ options {\n\ " max-acache-size 16M;\n\ @@ -12,7 +12,7 @@ max-clients-per-query 100;\n\ max-ncache-ttl 10800; /* 3 hours */\n\ max-recursion-depth 7;\n\ ---- bin/named/server.c.orig 2020-05-06 12:50:24 UTC +--- bin/named/server.c.orig 2020-06-10 18:00:37 UTC +++ bin/named/server.c @@ -3720,6 +3720,16 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } @@ -31,7 +31,7 @@ result = ns_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 2020-05-06 12:50:24 UTC +--- lib/dns/include/dns/view.h.orig 2020-06-10 18:00:37 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,8 @@ struct dns_view { bool requestnsid; @@ -42,9 +42,9 @@ dns_ttl_t maxncachettl; uint32_t nta_lifetime; uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2020-05-06 12:50:24 UTC +--- lib/dns/resolver.c.orig 2020-06-10 18:00:37 UTC +++ lib/dns/resolver.c -@@ -5553,6 +5553,18 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb +@@ -5549,6 +5549,18 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb } /* @@ -63,7 +63,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2020-05-06 12:50:24 UTC +--- lib/isccfg/namedconf.c.orig 2020-06-10 18:00:37 UTC +++ lib/isccfg/namedconf.c @@ -1773,6 +1773,8 @@ view_clauses[] = { #endif |