diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2023-12-09 17:40:50 +0100 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2024-05-17 19:55:38 +0200 |
| commit | 0663765e3e2ec63b81cd670a93022757b3f0e69d (patch) | |
| tree | 5a8074c50a8cc822d3bf004f6dd6eded6f5af2ed /dns/bind9-devel/files/extrapatch-bind-min-override-ttl | |
| parent | dns/bind9-devel: update to 9.19.18 (diff) | |
dns/bind9-devel: update to 9.19.19
Diffstat (limited to 'dns/bind9-devel/files/extrapatch-bind-min-override-ttl')
| -rw-r--r-- | dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 3305062720c8..9ebcfc0fc5ae 100644 --- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl +++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl @@ -1,8 +1,8 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2023-11-09 12:05:47 UTC +--- bin/named/config.c.orig 2023-12-08 11:46:50 UTC +++ bin/named/config.c -@@ -177,6 +177,7 @@ options {\n\ +@@ -179,6 +179,7 @@ options {\n\ notify-source *;\n\ notify-source-v6 *;\n\ nsec3-test-zone no;\n\ @@ -10,9 +10,9 @@ Add the override-cache-ttl feature. parental-source *;\n\ parental-source-v6 *;\n\ provide-ixfr true;\n\ ---- bin/named/server.c.orig 2023-11-09 12:05:47 UTC +--- bin/named/server.c.orig 2023-12-08 11:46:50 UTC +++ bin/named/server.c -@@ -4473,6 +4473,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4472,6 +4472,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; @@ -24,9 +24,22 @@ 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); ---- lib/dns/include/dns/view.h.orig 2023-11-09 12:05:47 UTC +--- doc/arm/reference.rst.orig 2023-12-08 11:46:50 UTC ++++ doc/arm/reference.rst +@@ -4198,6 +4198,10 @@ Tuning + cannot exceed 7 days and is silently truncated to 7 days if set to a + greater value. + ++.. namedconf:statement:: override-cache-ttl ++ ++ Enforce the configure cache TTL override. ++ + .. 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 2023-12-08 11:46:50 UTC +++ lib/dns/include/dns/view.h -@@ -149,6 +149,7 @@ struct dns_view { +@@ -151,6 +151,7 @@ struct dns_view { bool requestnsid; bool sendcookie; dns_ttl_t maxcachettl; @@ -34,7 +47,7 @@ Add the override-cache-ttl feature. dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2023-11-09 12:05:47 UTC +--- lib/dns/resolver.c.orig 2023-12-08 11:46:50 UTC +++ lib/dns/resolver.c @@ -5933,6 +5933,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes } @@ -49,9 +62,9 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2023-11-09 12:05:47 UTC +--- lib/isccfg/namedconf.c.orig 2023-12-08 11:46:50 UTC +++ lib/isccfg/namedconf.c -@@ -2088,6 +2088,7 @@ static cfg_clausedef_t view_clauses[] = { +@@ -2096,6 +2096,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ { "max-acache-size", NULL, CFG_CLAUSEFLAG_ANCIENT }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, |