[master] shorten default servfail-ttl

4239.	[func]		Changed default servfail-ttl value to 1 second from 10.
			Also, the maximum value is now 30 instead of 300. [RT #37556]

diff --git a/CHANGES b/CHANGES
index 2238eae332d7270503ea66c2f7d20f69ab95527d..74c8d44e2679d1cd24b96ad7e7d7f379693f440b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4239.  [func]          Changed default servfail-ttl value to 1 second from 10.
+                       Also, the maximum value is now 30 instead of 300. [RT #37556]
+
 4238.  [bug]           Don't send to servers on net zero (0.0.0.0/8).
                        [RT #40947]
 

diff --git a/bin/named/config.c b/bin/named/config.c
index 4743be09d192ade7df6eae7c4fa6a0718abd3451..c5d5e23c2929e16c5933eb5b4ee1d93a324ba175 100644 (file)
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -156,7 +156,7 @@ options {\n\
        cleaning-interval 0;  /* now meaningless */\n\
 #      min-roots <obsolete>;\n\
        lame-ttl 600;\n\
-       servfail-ttl 10;\n\
+       servfail-ttl 1;\n\
        max-ncache-ttl 10800; /* 3 hours */\n\
        max-cache-ttl 604800; /* 1 week */\n\
        transfer-format many-answers;\n\

diff --git a/bin/named/server.c b/bin/named/server.c
index 15496d3ddbc076e2ef3ebbed4604af0b64fd5f10..f607cbd8d0b6885aa646ff2992b5fe83a26c3782 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -4107,8 +4107,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist,
        result = ns_config_get(maps, "servfail-ttl", &obj);
        INSIST(result == ISC_R_SUCCESS);
        fail_ttl  = cfg_obj_asuint32(obj);
-       if (fail_ttl > 300)
-               fail_ttl = 300;
+       if (fail_ttl > 30)
+               fail_ttl = 30;
        dns_view_setfailttl(view, fail_ttl);
 
        /*

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 803aeacdee00d5bac197da4c096739ba18e9399f..6a5990f5d16c20ddbf85eba632e97c52b60a84c6 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -8903,10 +8903,10 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
                  without waiting for the SERVFAIL TTL to expire.
                </para>
                <para>
-                 The maximum value is <literal>300</literal>
-                 (5 minutes); any higher value will be silently
-                 reduced.  The default is <literal>10</literal>
-                 seconds.
+                 The maximum value is <literal>30</literal>
+                 seconds; any higher value will be silently
+                 reduced. The default is <literal>1</literal>
+                 second.
                </para>
              </listitem>
            </varlistentry>

diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index e4ef31df2c5995bd5a316ae3d68be0f375124520..76e94f215f2cea83a6ea73c23451287a3b0bd7af 100644 (file)
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -257,7 +257,7 @@
          the cache times out.  This reduces the frequency of retries
          when a query is persistently failing, which can be a burden
          on recursive serviers.  The SERVFAIL cache timeout is controlled
-         by <option>servfail-ttl</option>, which defaults to 10 seconds
+         by <option>servfail-ttl</option>, which defaults to 1 second
          and has an upper limit of 30.
        </para>
       </listitem>