diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2020-05-25 16:50:39 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2020-05-25 16:50:39 +0000 |
| commit | e3fa3ab157e8d6ea1f74fcf4fff53c4218da26a0 (patch) | |
| tree | bc81a5e83c2dbce79727eaab5f2c5ed2fa2e22fc /dns/bind9-devel/files/extrapatch-bind-min-override-ttl | |
| parent | Fix QA (because I am stupid) (diff) | |
Update to latest commit.
While here, fix the bind-min-override-ttl patch. [1]
Submitted by: Andre Albsmeier [1]
Notes
Notes:
svn path=/head/; revision=536481
Diffstat (limited to 'dns/bind9-devel/files/extrapatch-bind-min-override-ttl')
| -rw-r--r-- | dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 14 |
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 4ef36c65ea90..6ef48704f746 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-05-10 23:44:14 UTC +--- bin/named/config.c.orig 2020-05-25 12:38:28 UTC +++ bin/named/config.c @@ -180,6 +180,7 @@ options {\n\ notify-source *;\n\ @@ -10,7 +10,7 @@ Add the override-cache-ttl feature. provide-ixfr true;\n\ qname-minimization relaxed;\n\ query-source address *;\n\ ---- bin/named/server.c.orig 2020-05-10 23:44:14 UTC +--- bin/named/server.c.orig 2020-05-25 12:38:28 UTC +++ bin/named/server.c @@ -4331,6 +4331,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } @@ -18,13 +18,13 @@ Add the override-cache-ttl feature. obj = NULL; + result = named_config_get(maps, "override-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); -+ view->overridecachettl = cfg_obj_asuint32(obj); ++ view->overridecachettl = cfg_obj_asduration(obj); + + obj = NULL; 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-05-10 23:44:14 UTC +--- lib/dns/include/dns/view.h.orig 2020-05-25 12:38:28 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-05-10 23:44:14 UTC +--- lib/dns/resolver.c.orig 2020-05-25 12:38:28 UTC +++ lib/dns/resolver.c -@@ -6233,6 +6233,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb +@@ -6236,6 +6236,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb } /* @@ -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 2020-05-10 23:44:14 UTC +--- lib/isccfg/namedconf.c.orig 2020-05-25 12:38:28 UTC +++ lib/isccfg/namedconf.c @@ -1992,6 +1992,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ |