]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
remove seen_dname
authorMark Andrews <marka@isc.org>
Wed, 13 Feb 2019 04:57:03 +0000 (15:57 +1100)
committerMark Andrews <marka@isc.org>
Mon, 18 Feb 2019 23:18:19 +0000 (10:18 +1100)
(cherry picked from commit 63c03cdb2d5ea425dd34c77c5d3291228b4dfffc)

lib/dns/zone.c

index 4340d62b2753e60edfadcc6441edd90b7ef0c8b7..daca1992a795352aa3299804bc7afade43506382 100644 (file)
@@ -6916,8 +6916,7 @@ sign_a_node(dns_db_t *db, dns_name_t *name, dns_dbnode_t *node,
        dns_rdata_t rdata = DNS_RDATA_INIT;
        isc_buffer_t buffer;
        unsigned char data[1024];
-       bool seen_soa, seen_ns, seen_rr, seen_dname, seen_nsec,
-                     seen_nsec3, seen_ds;
+       bool seen_soa, seen_ns, seen_rr, seen_nsec, seen_nsec3, seen_ds;
 
        result = dns_db_allrdatasets(db, node, version, 0, &iterator);
        if (result != ISC_R_SUCCESS) {
@@ -6928,8 +6927,7 @@ sign_a_node(dns_db_t *db, dns_name_t *name, dns_dbnode_t *node,
 
        dns_rdataset_init(&rdataset);
        isc_buffer_init(&buffer, data, sizeof(data));
-       seen_rr = seen_soa = seen_ns = seen_dname = seen_nsec =
-       seen_nsec3 = seen_ds = false;
+       seen_rr = seen_soa = seen_ns = seen_nsec = seen_nsec3 = seen_ds = false;
        for (result = dns_rdatasetiter_first(iterator);
             result == ISC_R_SUCCESS;
             result = dns_rdatasetiter_next(iterator)) {
@@ -6940,8 +6938,6 @@ sign_a_node(dns_db_t *db, dns_name_t *name, dns_dbnode_t *node,
                        seen_ns = true;
                else if (rdataset.type == dns_rdatatype_ds)
                        seen_ds = true;
-               else if (rdataset.type == dns_rdatatype_dname)
-                       seen_dname = true;
                else if (rdataset.type == dns_rdatatype_nsec)
                        seen_nsec = true;
                else if (rdataset.type == dns_rdatatype_nsec3)