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 | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 027675dc7ee3..594b6a427d69 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 2015-11-11 11:38:39 UTC +--- bin/named/config.c.orig 2015-12-19 01:04:14 UTC +++ bin/named/config.c -@@ -158,6 +158,8 @@ options {\n\ +@@ -159,6 +159,8 @@ options {\n\ lame-ttl 600;\n\ servfail-ttl 1;\n\ max-ncache-ttl 10800; /* 3 hours */\n\ @@ -9,10 +9,9 @@ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ max-cache-size 90%;\n\ - max-cache-size 0;\n\ ---- bin/named/server.c.orig 2015-11-11 11:38:39 UTC +--- bin/named/server.c.orig 2015-12-19 01:04:14 UTC +++ bin/named/server.c -@@ -3020,6 +3020,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3022,6 +3022,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -29,8 +28,7 @@ result = ns_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); - view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2015-11-11 11:38:39 UTC +--- lib/dns/include/dns/view.h.orig 2015-12-19 01:04:14 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -41,8 +39,7 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; - dns_aclenv_t aclenv; ---- lib/dns/resolver.c.orig 2015-11-11 11:38:39 UTC +--- lib/dns/resolver.c.orig 2015-12-19 01:04:14 UTC +++ lib/dns/resolver.c @@ -5397,6 +5397,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } @@ -63,10 +60,9 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) - if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2015-11-11 11:38:39 UTC +--- lib/isccfg/namedconf.c.orig 2015-12-19 01:04:14 UTC +++ lib/isccfg/namedconf.c -@@ -1676,6 +1676,8 @@ view_clauses[] = { +@@ -1677,6 +1677,8 @@ view_clauses[] = { { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, { "max-acache-size", &cfg_type_sizenodefault, 0 }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, |