upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-20 01:48:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
(cherry picked from commit eb5243365c)
This commit is contained in:
Mark Andrews 2014-10-30 10:53:12 +11:00
parent f3ddf32fcc
commit ab7a781bc3
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -1,3 +1,5 @@
3989. [cleanup] Remove redundent dns_db_resigned calls. [RT #35748]
3987. [func] Handle future Visual Studio 14 incompatible changes.
[RT #37380]

13
lib/dns/zone.c
View file

@ -5840,7 +5840,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);
@ -5866,7 +5866,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)) {
@ -5882,8 +5881,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;
@ -5902,7 +5899,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;
}
@ -5966,7 +5962,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,
@ -5989,9 +5984,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;
@ -6226,8 +6218,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;