diff --git a/CHANGES b/CHANGES index 8a1c7a1b80..e3367af4dc 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ + + 950. [bug] Explicit TTLs did not properly override $TTL + due to a bug in change 834. [RT #1558] + 949. [bug] host was unable to print records larger than 512 bytes. [RT #1557] diff --git a/lib/dns/master.c b/lib/dns/master.c index f40ad0dead..c7568684d7 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: master.c,v 1.120 2001/07/24 18:49:06 bwelling Exp $ */ +/* $Id: master.c,v 1.121 2001/08/01 17:58:45 gson Exp $ */ #include @@ -1424,7 +1424,7 @@ load(dns_loadctx_t *lctx) { goto insist_and_cleanup; } } - } else if (lctx->default_ttl_known) { + } else if (!explicit_ttl && lctx->default_ttl_known) { lctx->ttl = lctx->default_ttl; } else if (!explicit_ttl && lctx->warn_1035) { (*callbacks->warn)(callbacks,