diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2020-07-07 10:49:54 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2020-07-07 10:49:54 +0000 |
commit | 5c77f25a9bdf4490b4bca3c01466d31b438ff6fb (patch) | |
tree | 725a7628129df476043bc541fe75abf3235367f5 /dns/bind9-devel/files/extrapatch-bind-min-override-ttl | |
parent | Switch to rails 6.0. (diff) |
Update to latest commit.
Notes
Notes:
svn path=/head/; revision=541409
Diffstat (limited to 'dns/bind9-devel/files/extrapatch-bind-min-override-ttl')
-rw-r--r-- | dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index eae34a9f5d6f..6b6e32a82358 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 2020-06-06 05:02:12 UTC +--- bin/named/config.c.orig 2020-07-06 09:00:26 UTC +++ bin/named/config.c @@ -180,6 +180,7 @@ options {\n\ notify-source *;\n\ @@ -10,9 +10,9 @@ Add the override-cache-ttl feature. provide-ixfr true;\n\ qname-minimization relaxed;\n\ query-source address *;\n\ ---- bin/named/server.c.orig 2020-06-06 05:02:12 UTC +--- bin/named/server.c.orig 2020-07-06 09:00:26 UTC +++ bin/named/server.c -@@ -4331,6 +4331,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4333,6 +4333,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 2020-06-06 05:02:12 UTC +--- lib/dns/include/dns/view.h.orig 2020-07-06 09:00:26 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,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 2020-06-06 05:02:12 UTC +--- lib/dns/resolver.c.orig 2020-07-06 09:00:26 UTC +++ lib/dns/resolver.c -@@ -6235,6 +6235,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb +@@ -6244,6 +6244,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb } /* @@ -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 2020-06-06 05:02:12 UTC +--- lib/isccfg/namedconf.c.orig 2020-07-06 09:00:26 UTC +++ lib/isccfg/namedconf.c -@@ -1992,6 +1992,7 @@ static cfg_clausedef_t view_clauses[] = { +@@ -1993,6 +1993,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, |