diff options
Diffstat (limited to 'dns/bind9-devel/files/extrapatch-bind-min-override-ttl')
| -rw-r--r-- | dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index d2a6e52edc54..a28843d6b60c 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 @@ ---- bin/named/config.c.orig 2017-04-20 07:59:45 UTC +--- bin/named/config.c.orig 2017-06-14 01:08:21 UTC +++ bin/named/config.c -@@ -158,6 +158,8 @@ options {\n\ +@@ -155,6 +155,8 @@ options {\n\ lame-ttl 600;\n\ servfail-ttl 1;\n\ max-ncache-ttl 10800; /* 3 hours */\n\ @@ -9,9 +9,9 @@ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ max-cache-size 90%;\n\ ---- bin/named/server.c.orig 2017-04-20 07:59:45 UTC +--- bin/named/server.c.orig 2017-06-14 01:08:21 UTC +++ bin/named/server.c -@@ -3751,6 +3751,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3713,6 +3713,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -28,9 +28,9 @@ result = ns_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 2017-04-20 07:59:45 UTC +--- lib/dns/include/dns/view.h.orig 2017-06-14 01:08:21 UTC +++ lib/dns/include/dns/view.h -@@ -146,6 +146,8 @@ struct dns_view { +@@ -143,6 +143,8 @@ struct dns_view { isc_boolean_t requestnsid; isc_boolean_t sendcookie; dns_ttl_t maxcachettl; @@ -39,7 +39,7 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2017-04-20 07:59:45 UTC +--- lib/dns/resolver.c.orig 2017-06-14 01:08:21 UTC +++ lib/dns/resolver.c @@ -5468,6 +5468,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } @@ -60,11 +60,11 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2017-04-20 07:59:45 UTC +--- lib/isccfg/namedconf.c.orig 2017-06-14 01:08:21 UTC +++ lib/isccfg/namedconf.c -@@ -1882,6 +1882,8 @@ view_clauses[] = { - { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, - { "max-acache-size", &cfg_type_sizenodefault, 0 }, +@@ -1893,6 +1893,8 @@ view_clauses[] = { + { "max-acache-size", &cfg_type_sizenodefault, + CFG_CLAUSEFLAG_OBSOLETE }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, + { "override-cache-ttl", &cfg_type_uint32, 0 }, + { "min-cache-ttl", &cfg_type_uint32, 0 }, |