pullup:

1136.   [bug]           CNAME records synthesized from DNAMEs did not
                        have a TTL of zero as required by RFC2672
                        [RT #2129]

diff --git a/CHANGES b/CHANGES
index b525ba5ecd1872029e80367fb527d46a455f0587..20a00a4a50cc5f7ad261f9e9454559832df03cd4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1136.  [bug]           CNAME records synthesized from DNAMEs did not
+                       have a TTL of zero as required by RFC2672
+                       [RT #2129]
+
 1134.  [bug]           Multithreaded servers could deadlock in ferror()
                        when reloading zone files. [RT #1951, #1998]
 

diff --git a/bin/named/query.c b/bin/named/query.c
index 144c2a705787c4398d675b2c328e08499f501786..1713079eda0682320921d2416116bea5ff3b1ff2 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.163.2.6 2001/11/15 01:30:46 marka Exp $ */
+/* $Id: query.c,v 1.163.2.7 2001/11/27 00:51:09 marka Exp $ */
 
 #include <config.h>
 
@@ -2974,7 +2974,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
                 */
                dns_name_init(tname, NULL);
                query_addcname(client, client->query.qname, fname,
-                              trdataset->ttl, &tname);
+                              0, &tname);
                if (tname != NULL)
                        dns_message_puttempname(client->message, &tname);
                /*