summaryrefslogtreecommitdiff
path: root/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2022-04-04 09:05:45 +0200
committerMathieu Arnold <mat@FreeBSD.org>2022-04-04 09:05:45 +0200
commitdf038f5132c0ea5aaf2ba4d8e910e10a2e4ab7bb (patch)
tree4571a77e2c3983f49fd759cc9a0f0c4c8467d80a /dns/bind9-devel/files/extrapatch-bind-min-override-ttl
parentwww/grafana7: Update to upstream version 7.5.15 (diff)
dns/bind9-devel: update to latest commit
Diffstat (limited to 'dns/bind9-devel/files/extrapatch-bind-min-override-ttl')
-rw-r--r--dns/bind9-devel/files/extrapatch-bind-min-override-ttl14
1 files changed, 7 insertions, 7 deletions
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index ebb596e99f54..a382f62e56e8 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,6 +1,6 @@
Add the override-cache-ttl feature.
---- bin/named/config.c.orig 2022-03-25 15:13:28 UTC
+--- bin/named/config.c.orig 2022-04-01 23:48:26 UTC
+++ bin/named/config.c
@@ -171,6 +171,7 @@ options {\n\
notify-source *;\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 2022-03-25 15:13:28 UTC
+--- bin/named/server.c.orig 2022-04-01 23:48:26 UTC
+++ bin/named/server.c
-@@ -4484,6 +4484,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4487,6 +4487,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
obj = NULL;
@@ -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);
---- lib/dns/include/dns/view.h.orig 2022-03-25 15:13:28 UTC
+--- lib/dns/include/dns/view.h.orig 2022-04-01 23:48:26 UTC
+++ lib/dns/include/dns/view.h
@@ -155,6 +155,7 @@ struct dns_view {
bool requestnsid;
@@ -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 2022-03-25 15:13:28 UTC
+--- lib/dns/resolver.c.orig 2022-04-01 23:48:26 UTC
+++ lib/dns/resolver.c
-@@ -6126,6 +6126,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6113,6 +6113,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
}
/*
@@ -49,7 +49,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-03-25 15:13:28 UTC
+--- lib/isccfg/namedconf.c.orig 2022-04-01 23:48:26 UTC
+++ lib/isccfg/namedconf.c
@@ -2092,6 +2092,7 @@ static cfg_clausedef_t view_clauses[] = {
#endif /* ifdef HAVE_LMDB */