diff options
Diffstat (limited to 'dns/bind9-devel/files/extrapatch-bind-min-override-ttl')
| -rw-r--r-- | dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 1ef483b64a5c..d3917c8d825e 100644 --- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl +++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl @@ -1,18 +1,18 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2025-10-18 09:48:52 UTC -+++ bin/named/config.c -@@ -186,6 +186,7 @@ options {\n\ +--- bin/include/defaultconfig.h.orig 2025-11-07 09:34:27 UTC ++++ bin/include/defaultconfig.h +@@ -159,6 +159,7 @@ options {\n\ notify-source *;\n\ notify-source-v6 *;\n\ nsec3-test-zone no;\n\ -+ override-cache-ttl 0; /* do not override */\n\ ++ override-cache-ttl 0;\n\ parental-source *;\n\ parental-source-v6 *;\n\ provide-ixfr true;\n\ ---- bin/named/server.c.orig 2025-10-18 09:48:52 UTC +--- bin/named/server.c.orig 2025-11-07 09:34:27 UTC +++ bin/named/server.c -@@ -4276,6 +4276,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4198,6 +4198,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; @@ -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 2025-10-18 09:48:52 UTC +--- doc/arm/reference.rst.orig 2025-11-07 09:34:27 UTC +++ doc/arm/reference.rst -@@ -4175,6 +4175,10 @@ Tuning +@@ -4154,6 +4154,10 @@ Tuning cannot exceed 7 days and is silently truncated to 7 days if set to a greater value. @@ -37,9 +37,9 @@ 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. ---- doc/misc/options.orig 2025-10-18 09:48:52 UTC +--- doc/misc/options.orig 2025-11-07 09:34:27 UTC +++ doc/misc/options -@@ -172,6 +172,7 @@ options { +@@ -171,6 +171,7 @@ options { masterfile-style ( full | relative ); match-mapped-addresses <boolean>; max-cache-size ( default | unlimited | <sizeval> | <percentage> ); @@ -47,9 +47,9 @@ Add the override-cache-ttl feature. max-cache-ttl <duration>; max-clients-per-query <integer>; max-ixfr-ratio ( unlimited | <percentage> ); ---- lib/dns/include/dns/view.h.orig 2025-10-18 09:48:52 UTC +--- lib/dns/include/dns/view.h.orig 2025-11-07 09:34:27 UTC +++ lib/dns/include/dns/view.h -@@ -148,6 +148,7 @@ struct dns_view { +@@ -155,6 +155,7 @@ struct dns_view { bool requestzoneversion; bool sendcookie; dns_ttl_t maxcachettl; @@ -57,9 +57,9 @@ Add the override-cache-ttl feature. dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2025-10-18 09:48:52 UTC +--- lib/dns/resolver.c.orig 2025-11-07 09:34:27 UTC +++ lib/dns/resolver.c -@@ -5839,6 +5839,12 @@ fixttls(dns_view_t *view, dns_rdataset_t *rdataset, +@@ -5836,6 +5836,12 @@ fixttls(dns_view_t *view, dns_rdataset_t *rdataset, fixttls(dns_view_t *view, dns_rdataset_t *rdataset, dns_rdataset_t *sigrdataset) { /* @@ -72,13 +72,13 @@ Add the override-cache-ttl feature. * Enforce the configured maximum and minimum cache TTL. */ if (rdataset->ttl > view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2025-10-18 09:48:52 UTC +--- lib/isccfg/namedconf.c.orig 2025-11-07 09:34:27 UTC +++ lib/isccfg/namedconf.c -@@ -2086,6 +2086,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 }, +@@ -2399,6 +2399,7 @@ static cfg_clausedef_t view_clauses[] = { + { "nta-lifetime", &cfg_type_duration, 0 }, + { "nta-recheck", &cfg_type_duration, 0 }, + { "nxdomain-redirect", &cfg_type_astring, 0 }, + { "override-cache-ttl", &cfg_type_duration, 0 }, - { "max-cache-ttl", &cfg_type_duration, 0 }, - { "max-clients-per-query", &cfg_type_uint32, 0 }, - { "max-ncache-ttl", &cfg_type_duration, 0 }, + { "preferred-glue", &cfg_type_astring, 0 }, + { "prefetch", &cfg_type_prefetch, 0, prefetch_merge }, + { "provide-ixfr", &cfg_type_boolean, 0 }, |