summaryrefslogtreecommitdiff
path: root/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2019-11-04 14:06:47 +0000
committerMathieu Arnold <mat@FreeBSD.org>2019-11-04 14:06:47 +0000
commit6ea10085b9db3f614eb3384e5a978c05571b5b4e (patch)
tree24674dcc1a9031e9419f7ed0f24ee26ddcac3345 /dns/bind9-devel/files/extrapatch-bind-min-override-ttl
parentUpdate to v5.31.5-160-g98f0203bc5. (diff)
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-ttl12
1 files changed, 6 insertions, 6 deletions
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index b41c3d66e6a5..20a93538bde6 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 2019-10-06 03:16:14 UTC
+--- bin/named/config.c.orig 2019-10-31 19:19:57 UTC
+++ bin/named/config.c
@@ -177,6 +177,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 2019-10-06 03:16:14 UTC
+--- bin/named/server.c.orig 2019-10-31 19:19:57 UTC
+++ bin/named/server.c
@@ -4215,6 +4215,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
@@ -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_asuint32(obj);
---- lib/dns/include/dns/view.h.orig 2019-10-06 03:16:14 UTC
+--- lib/dns/include/dns/view.h.orig 2019-10-31 19:19:57 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 2019-10-06 03:16:14 UTC
+--- lib/dns/resolver.c.orig 2019-10-31 19:19:57 UTC
+++ lib/dns/resolver.c
-@@ -6028,6 +6028,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
+@@ -6056,6 +6056,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 2019-10-06 03:16:14 UTC
+--- lib/isccfg/namedconf.c.orig 2019-10-31 19:19:57 UTC
+++ lib/isccfg/namedconf.c
@@ -1907,6 +1907,7 @@ view_clauses[] = {
#endif