2729. [func] When constructing a CNAME from a DNAME use the DNAME

                        TTL. [RT #20451]

diff --git a/CHANGES b/CHANGES
index c2d64530b4b35e9a24406e447692ae6c076dde8f..5989411ce5a263ada65c4ce6820e0bc7c72fcffd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2729.  [func]          When constructing a CNAME from a DNAME use the DNAME
+                       TTL. [RT #20451]
+
 2723.  [bug]           isc_base64_totext() didn't always mark regions of
                        memory as fully consumed after conversion.  [RT #20445]
 

diff --git a/bin/named/query.c b/bin/named/query.c
index 08dc9c3f019738bd2e9016b0a472618166ac25a3..7aed14cae5c7d5cd405a801836beb683cff7ae02 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.298.48.15 2009/09/16 22:28:52 marka Exp $ */
+/* $Id: query.c,v 1.298.48.16 2009/10/27 22:49:15 marka Exp $ */
 
 /*! \file */
 
@@ -2223,7 +2223,8 @@ query_addns(ns_client_t *client, dns_db_t *db, dns_dbversion_t *version) {
 
 static inline isc_result_t
 query_addcnamelike(ns_client_t *client, dns_name_t *qname, dns_name_t *tname,
-                  dns_trust_t trust, dns_name_t **anamep, dns_rdatatype_t type)
+                  dns_rdataset_t *dname, dns_name_t **anamep,
+                  dns_rdatatype_t type)
 {
        dns_rdataset_t *rdataset;
        dns_rdatalist_t *rdatalist;
@@ -2259,7 +2260,7 @@ query_addcnamelike(ns_client_t *client, dns_name_t *qname, dns_name_t *tname,
        rdatalist->type = type;
        rdatalist->covers = 0;
        rdatalist->rdclass = client->message->rdclass;
-       rdatalist->ttl = 0;
+       rdatalist->ttl = dname->ttl;
 
        dns_name_toregion(tname, &r);
        rdata->data = r.base;
@@ -2271,7 +2272,7 @@ query_addcnamelike(ns_client_t *client, dns_name_t *qname, dns_name_t *tname,
        ISC_LIST_APPEND(rdatalist->rdata, rdata, link);
        RUNTIME_CHECK(dns_rdatalist_tordataset(rdatalist, rdataset)
                      == ISC_R_SUCCESS);
-       rdataset->trust = trust;
+       rdataset->trust = dname->trust;
 
        query_addrrset(client, anamep, &rdataset, NULL, NULL,
                       DNS_SECTION_ANSWER);
@@ -4176,7 +4177,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
                 */
                dns_name_init(tname, NULL);
                (void)query_addcnamelike(client, client->query.qname, fname,
-                                        trdataset->trust, &tname,
+                                        trdataset, &tname,
                                         dns_rdatatype_cname);
                if (tname != NULL)
                        dns_message_puttempname(client->message, &tname);