1019. [bug] The value of the lame-ttl option was limited to 18000

                        seconds, not 1800 seconds as documented. [RT #1803]

diff --git a/CHANGES b/CHANGES
index a2485cc2eae08d2889f419dccdad6ab0f70c40f3..ed7bf182931e421fdf2ec7f38088379a247df022 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1019.  [bug]           The value of the lame-ttl option was limited to 18000
+                       seconds, not 1800 seconds as documented. [RT #1803]
 
 1017.  [bug]           When specifying TSIG keys to dig and nsupdate using
                        the -k option, they must be HMAC-MD5 keys.  [RT #1810]

diff --git a/bin/named/server.c b/bin/named/server.c
index ef342ad2f9acdb3cf3f3e35ed5af532daa44424a..24978b80acfb5327ab019b742e55c549627c7bae 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.339 2001/08/07 01:58:56 marka Exp $ */
+/* $Id: server.c,v 1.339.2.1 2001/09/28 05:35:47 marka Exp $ */
 
 #include <config.h>
 
@@ -649,8 +649,8 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
        result = ns_config_get(maps, "lame-ttl", &obj);
        INSIST(result == ISC_R_SUCCESS);
        lame_ttl = cfg_obj_asuint32(obj);
-       if (lame_ttl > 18000)
-               lame_ttl = 18000;
+       if (lame_ttl > 1800)
+               lame_ttl = 1800;
        dns_resolver_setlamettl(view->resolver, lame_ttl);
        
        /*