mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

[master] fix a test error in smartsign

Browse Source
This commit is contained in:
Evan Hunt
2017-10-03 12:19:36 -07:00
parent b47814be1c
commit 9510de7849
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/dnssec/dnssec-signzone.c
View File

@@ -2610,7 +2610,6 @@ build_final_keylist(void) {
dns_dnsseckeylist_t rmkeys, matchkeys; dns_dnsseckeylist_t rmkeys, matchkeys;
char name[DNS_NAME_FORMATSIZE]; char name[DNS_NAME_FORMATSIZE];
dns_rdataset_t cdsset, cdnskeyset, soaset; dns_rdataset_t cdsset, cdnskeyset, soaset;
dns_ttl_t ttl;
ISC_LIST_INIT(rmkeys); ISC_LIST_INIT(rmkeys);
ISC_LIST_INIT(matchkeys); ISC_LIST_INIT(matchkeys);
@@ -2635,13 +2634,6 @@ build_final_keylist(void) {
result = dns_db_getoriginnode(gdb, &node); result = dns_db_getoriginnode(gdb, &node);
check_result(result, "dns_db_getoriginnode"); check_result(result, "dns_db_getoriginnode");
/* Get the SOA record's TTL */
result = dns_db_findrdataset(gdb, node, ver, dns_rdatatype_soa,
dns_rdatatype_none, 0, &soaset, NULL);
check_result(result, "dns_db_findrdataset");
ttl = soaset.ttl;
dns_rdataset_disassociate(&soaset);
/* Get the CDS rdataset */ /* Get the CDS rdataset */
result = dns_db_findrdataset(gdb, node, ver, dns_rdatatype_cds, result = dns_db_findrdataset(gdb, node, ver, dns_rdatatype_cds,
dns_rdatatype_none, 0, &cdsset, NULL); dns_rdatatype_none, 0, &cdsset, NULL);
@@ -2665,14 +2657,14 @@ build_final_keylist(void) {
/* /*
* Update keylist with information from from the key repository. * Update keylist with information from from the key repository.
*/ */
dns_dnssec_updatekeys(&keylist, &matchkeys, &rmkeys, gorigin, keyttl, dns_dnssec_updatekeys(&keylist, &matchkeys, NULL, gorigin, keyttl,
&diff, ignore_kskflag, mctx, report); &diff, ignore_kskflag, mctx, report);
/* /*
* Update keylist with sync records. * Update keylist with sync records.
*/ */
dns_dnssec_syncupdate(&keylist, &rmkeys, &cdsset, &cdnskeyset, dns_dnssec_syncupdate(&keylist, &rmkeys, &cdsset, &cdnskeyset,
now, ttl, &diff, mctx); now, keyttl, &diff, mctx);
dns_name_format(gorigin, name, sizeof(name)); dns_name_format(gorigin, name, sizeof(name));

2
bin/tests/system/smartsign/tests.sh
View File

@@ -256,7 +256,7 @@ sub=0
grep -w "$czgenerated" dnskey.sigs > /dev/null && sub=1 grep -w "$czgenerated" dnskey.sigs > /dev/null && sub=1
if [ $sub != 0 ]; then echo "I:found czgenerated $czgenerated (dnskey)"; ret=1; fi if [ $sub != 0 ]; then echo "I:found czgenerated $czgenerated (dnskey)"; ret=1; fi
# now check other signatures first # now check other signatures first
awk '$2 == "RRSIG" && $3 != "DNSKEY" { getline; print $3 }' $cfile.signed | sort -un > other.sigs awk '$2 == "RRSIG" && $3 != "DNSKEY" && $3 != "CDNSKEY" && $3 != "CDS" { getline; print $3 }' $cfile.signed | sort -un > other.sigs
# should not be there: # should not be there:
echo $ret > /dev/null echo $ret > /dev/null
sync sync