3989. [cleanup] Remove redundent dns_db_resigned calls. [RT #35748]

diff --git a/CHANGES b/CHANGES
index aad86566b59fc69cce1ed3afcb7fd85950f6afae..37b2f7b8f973f0316b2a0664013a039504159d38 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3989.  [cleanup]       Remove redundent dns_db_resigned calls. [RT #35748]
+
 3988.  [func]          Allow the zone serial of a dynamically updatable
                        zone to be updated via "rndc signing -serial".
                        [RT #37404]

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 87078ef2a3f7cab1ef7d59acc69fc23a44bcacae..88f6107b12bc7e052eb7a3727ba5cceec2e0b859 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -5875,7 +5875,7 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
        dns_rdataset_t rdataset;
        unsigned int i;
        dns_rdata_rrsig_t rrsig;
-       isc_boolean_t found, changed;
+       isc_boolean_t found;
        isc_int64_t warn = 0, maybe = 0;
 
        dns_rdataset_init(&rdataset);
@@ -5901,7 +5901,6 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
                goto failure;
        }
 
-       changed = ISC_FALSE;
        for (result = dns_rdataset_first(&rdataset);
             result == ISC_R_SUCCESS;
             result = dns_rdataset_next(&rdataset)) {
@@ -5917,8 +5916,6 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
                                result = update_one_rr(db, ver, zonediff->diff,
                                               DNS_DIFFOP_DELRESIGN, name,
                                               rdataset.ttl, &rdata);
-                               if (incremental)
-                                       changed = ISC_TRUE;
                                if (result != ISC_R_SUCCESS)
                                        break;
                                deleted = ISC_TRUE;
@@ -5937,7 +5934,6 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
                                        result = offline(db, ver, zonediff,
                                                         name, rdataset.ttl,
                                                         &rdata);
-                                       changed = ISC_TRUE;
                                        if (result != ISC_R_SUCCESS)
                                                break;
                                }
@@ -6001,7 +5997,6 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
                                        result = offline(db, ver, zonediff,
                                                         name, rdataset.ttl,
                                                         &rdata);
-                                       changed = ISC_TRUE;
                                        break;
                                }
                                result = update_one_rr(db, ver, zonediff->diff,
@@ -6024,9 +6019,6 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
                        break;
        }
 
-       if (changed && (rdataset.attributes & DNS_RDATASETATTR_RESIGN) != 0)
-               dns_db_resigned(db, &rdataset, ver);
-
        dns_rdataset_disassociate(&rdataset);
        if (result == ISC_R_NOMORE)
                result = ISC_R_SUCCESS;
@@ -6261,8 +6253,7 @@ zone_resigninc(dns_zone_t *zone) {
                                     dns_result_totext(result));
                        break;
                }
-               result  = dns_db_getsigningtime(db, &rdataset,
-                                               dns_fixedname_name(&fixed));
+               result  = dns_db_getsigningtime(db, &rdataset, name);
                if (nkeys == 0 && result == ISC_R_NOTFOUND) {
                        result = ISC_R_SUCCESS;
                        break;