summaryrefslogtreecommitdiff
path: root/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2022-02-10 14:59:31 +0100
committerMathieu Arnold <mat@FreeBSD.org>2022-02-10 16:35:32 +0100
commit3f8d9dce081520f839ca51660ec418c132684d70 (patch)
tree434c7d607303c5f42ca955fa3da0d2d3849746ca /dns/bind9-devel/files/extrapatch-bind-min-override-ttl
parentdns/bind916: update to 9.16.25 (diff)
dns/bind9-devel: update to latest commit
Add back the Administrator Reference Manual in the DOCS option.
Diffstat (limited to 'dns/bind9-devel/files/extrapatch-bind-min-override-ttl')
-rw-r--r--dns/bind9-devel/files/extrapatch-bind-min-override-ttl20
1 files changed, 10 insertions, 10 deletions
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 6b7a6e7736f7..5cc994079bca 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 2021-10-08 10:07:46 UTC
+--- bin/named/config.c.orig 2022-02-09 16:40:14 UTC
+++ bin/named/config.c
-@@ -182,6 +182,7 @@ options {\n\
+@@ -172,6 +172,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 2021-10-08 10:07:46 UTC
+--- bin/named/server.c.orig 2022-02-09 16:40:14 UTC
+++ bin/named/server.c
-@@ -4479,6 +4479,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4496,6 +4496,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);
---- lib/dns/include/dns/view.h.orig 2021-10-08 10:07:46 UTC
+--- lib/dns/include/dns/view.h.orig 2022-02-09 16:40:14 UTC
+++ lib/dns/include/dns/view.h
-@@ -154,6 +154,7 @@ struct dns_view {
+@@ -155,6 +155,7 @@ struct dns_view {
bool requestnsid;
bool sendcookie;
dns_ttl_t maxcachettl;
@@ -34,9 +34,9 @@ Add the override-cache-ttl feature.
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
---- lib/dns/resolver.c.orig 2021-10-08 10:07:46 UTC
+--- lib/dns/resolver.c.orig 2022-02-09 16:40:14 UTC
+++ lib/dns/resolver.c
-@@ -5910,6 +5910,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6119,6 +6119,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
}
/*
@@ -49,9 +49,9 @@ Add the override-cache-ttl feature.
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2021-10-08 10:07:46 UTC
+--- lib/isccfg/namedconf.c.orig 2022-02-09 16:40:14 UTC
+++ lib/isccfg/namedconf.c
-@@ -2049,6 +2049,7 @@ static cfg_clausedef_t view_clauses[] = {
+@@ -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 },