summaryrefslogtreecommitdiff
path: root/dns/bind918/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2025-02-03 10:55:48 +0100
committerMathieu Arnold <mat@FreeBSD.org>2025-02-03 10:59:36 +0100
commit0693895763c9e413f2c4f56350134255107490c2 (patch)
treecde494e5d3431647b32cd5e33270ed71b8213104 /dns/bind918/files/extrapatch-bind-min-override-ttl
parenteditors/tea: Update to 63.2.0 (diff)
dns/bind918: update to 9.18.33
Security: CVE-2024-11187, CVE-2024-12705
Diffstat (limited to 'dns/bind918/files/extrapatch-bind-min-override-ttl')
-rw-r--r--dns/bind918/files/extrapatch-bind-min-override-ttl16
1 files changed, 8 insertions, 8 deletions
diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl b/dns/bind918/files/extrapatch-bind-min-override-ttl
index 2f0f8481af96..a07fa6623be0 100644
--- a/dns/bind918/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind918/files/extrapatch-bind-min-override-ttl
@@ -1,8 +1,8 @@
Add the override-cache-ttl feature.
---- bin/named/config.c.orig 2024-12-03 13:00:51 UTC
+--- bin/named/config.c.orig 2025-01-20 13:39:30 UTC
+++ bin/named/config.c
-@@ -185,6 +185,7 @@ options {\n\
+@@ -186,6 +186,7 @@ options {\n\
notify-source *;\n\
notify-source-v6 *;\n\
nsec3-test-zone no;\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 2024-12-03 13:00:51 UTC
+--- bin/named/server.c.orig 2025-01-20 13:39:30 UTC
+++ bin/named/server.c
@@ -4663,6 +4663,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
@@ -24,7 +24,7 @@ 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 2024-12-03 13:00:51 UTC
+--- doc/arm/reference.rst.orig 2025-01-20 13:39:31 UTC
+++ doc/arm/reference.rst
@@ -4388,6 +4388,10 @@ Tuning
cannot exceed 7 days and is silently truncated to 7 days if set to a
@@ -37,7 +37,7 @@ Add the override-cache-ttl feature.
.. namedconf:statement:: max-cache-ttl
:tags: server
:short: Specifies the maximum time (in seconds) that the server caches ordinary (positive) answers.
---- lib/dns/include/dns/view.h.orig 2024-12-03 13:00:51 UTC
+--- lib/dns/include/dns/view.h.orig 2025-01-20 13:39:31 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 2024-12-03 13:00:51 UTC
+--- lib/dns/resolver.c.orig 2025-01-20 13:39:31 UTC
+++ lib/dns/resolver.c
-@@ -6306,6 +6306,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6355,6 +6355,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 2024-12-03 13:00:51 UTC
+--- lib/isccfg/namedconf.c.orig 2025-01-20 13:39:31 UTC
+++ lib/isccfg/namedconf.c
@@ -2105,6 +2105,7 @@ static cfg_clausedef_t view_clauses[] = {
#endif /* ifdef HAVE_LMDB */