summaryrefslogtreecommitdiff
path: root/dns/bind918/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2022-09-21 16:39:17 +0200
committerMathieu Arnold <mat@FreeBSD.org>2022-09-21 17:13:57 +0200
commit15c63d09366ccf91e52b4a1ac18ac41b9afeec37 (patch)
tree101579f895f9242c13ec72269f55d4bd6484c791 /dns/bind918/files/extrapatch-bind-min-override-ttl
parentdns/bind916: update to 9.16.33 (diff)
dns/bind918: update to 9.18.7
Changes: https://downloads.isc.org/isc/bind9/9.18.7/doc/arm/html/notes.html#notes-for-bind-9-18-7 MFH: yes Security: CVE-2022-2795 CVE-2022-2881 CVE-2022-2906 CVE-2022-3080 CVE-2022-38177 CVE-2022-38178
Diffstat (limited to 'dns/bind918/files/extrapatch-bind-min-override-ttl')
-rw-r--r--dns/bind918/files/extrapatch-bind-min-override-ttl20
1 files changed, 10 insertions, 10 deletions
diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl b/dns/bind918/files/extrapatch-bind-min-override-ttl
index 74b67bae6d2a..abb9609c6700 100644
--- a/dns/bind918/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind918/files/extrapatch-bind-min-override-ttl
@@ -1,6 +1,6 @@
Add the override-cache-ttl feature.
---- bin/named/config.c.orig 2022-07-07 14:38:12 UTC
+--- bin/named/config.c.orig 2022-09-08 12:42:18 UTC
+++ bin/named/config.c
@@ -183,6 +183,7 @@ options {\n\
notify-source *;\n\
@@ -10,7 +10,7 @@ Add the override-cache-ttl feature.
parental-source *;\n\
parental-source-v6 *;\n\
provide-ixfr true;\n\
---- bin/named/server.c.orig 2022-07-07 14:38:12 UTC
+--- bin/named/server.c.orig 2022-09-08 12:42:18 UTC
+++ bin/named/server.c
@@ -4544,6 +4544,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
@@ -24,9 +24,9 @@ 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);
---- doc/arm/reference.rst.orig 2022-07-07 14:38:12 UTC
+--- doc/arm/reference.rst.orig 2022-09-08 12:42:18 UTC
+++ doc/arm/reference.rst
-@@ -3991,6 +3991,10 @@ Tuning
+@@ -4344,6 +4344,10 @@ Tuning
cannot exceed 7 days and is silently truncated to 7 days if set to a
greater value.
@@ -35,9 +35,9 @@ Add the override-cache-ttl feature.
+ Enforce the configure cache TTL override.
+
.. namedconf:statement:: max-cache-ttl
-
- This sets the maximum time for which the server caches ordinary (positive)
---- lib/dns/include/dns/view.h.orig 2022-07-07 14:38:12 UTC
+ :tags: server
+ :short: Specifies the maximum time (in seconds) that the server caches ordinary (positive) answers.
+--- lib/dns/include/dns/view.h.orig 2022-09-08 12:42:18 UTC
+++ lib/dns/include/dns/view.h
@@ -157,6 +157,7 @@ struct dns_view {
bool requestnsid;
@@ -47,9 +47,9 @@ Add the override-cache-ttl feature.
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
---- lib/dns/resolver.c.orig 2022-07-07 14:38:12 UTC
+--- lib/dns/resolver.c.orig 2022-09-08 12:42:18 UTC
+++ lib/dns/resolver.c
-@@ -6190,6 +6190,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6225,6 +6225,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
}
/*
@@ -62,7 +62,7 @@ Add the override-cache-ttl feature.
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2022-07-07 14:38:12 UTC
+--- lib/isccfg/namedconf.c.orig 2022-09-08 12:42:18 UTC
+++ lib/isccfg/namedconf.c
@@ -2092,6 +2092,7 @@ static cfg_clausedef_t view_clauses[] = {
#endif /* ifdef HAVE_LMDB */