diff --git a/bin/named/update.c b/bin/named/update.c index 59fc045872..132481fb4f 100644 --- a/bin/named/update.c +++ b/bin/named/update.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: update.c,v 1.162 2009/10/10 01:47:59 each Exp $ */ +/* $Id: update.c,v 1.163 2009/10/10 23:47:58 tbox Exp $ */ #include @@ -1857,7 +1857,7 @@ add_sigs(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, if (!dst_key_isprivate(keys[i])) continue; - if (check_ksk && !REVOKE(keys[i])) { + if (check_ksk && !REVOKE(keys[i])) { isc_boolean_t have_ksk, have_nonksk; if (KSK(keys[i])) { have_ksk = ISC_TRUE; @@ -1867,7 +1867,7 @@ add_sigs(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, have_nonksk = ISC_TRUE; } for (j = 0; j < nkeys; j++) { - if (j == i || ALG(keys[i]) != ALG(keys[j])) + if (j == i || ALG(keys[i]) != ALG(keys[j])) continue; if (REVOKE(keys[j])) continue; @@ -1875,7 +1875,7 @@ add_sigs(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, have_ksk = ISC_TRUE; else have_nonksk = ISC_TRUE; - both = have_ksk && have_nonksk; + both = have_ksk && have_nonksk; if (both) break; } @@ -2128,7 +2128,7 @@ update_signatures(ns_client_t *client, dns_zone_t *zone, dns_db_t *db, check_ksk = ISC_TF((dns_zone_getoptions(zone) & DNS_ZONEOPT_UPDATECHECKKSK) != 0); keyset_kskonly = ISC_TF((dns_zone_getoptions(zone) & - DNS_ZONEOPT_DNSKEYKSKONLY) != 0); + DNS_ZONEOPT_DNSKEYKSKONLY) != 0); /* * Get the NSEC/NSEC3 TTL from the SOA MINIMUM field. diff --git a/lib/dns/zone.c b/lib/dns/zone.c index a04a248ee3..49956f5e09 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone.c,v 1.514 2009/10/10 01:48:00 each Exp $ */ +/* $Id: zone.c,v 1.515 2009/10/10 23:47:58 tbox Exp $ */ /*! \file */ @@ -4454,7 +4454,7 @@ static isc_result_t add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_rdatatype_t type, dns_diff_t *diff, dst_key_t **keys, unsigned int nkeys, isc_mem_t *mctx, isc_stdtime_t inception, - isc_stdtime_t expire, isc_boolean_t check_ksk, + isc_stdtime_t expire, isc_boolean_t check_ksk, isc_boolean_t keyset_kskonly) { isc_result_t result; @@ -4494,7 +4494,7 @@ add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, for (i = 0; i < nkeys; i++) { isc_boolean_t both = ISC_FALSE; - + if (!dst_key_isprivate(keys[i])) continue; @@ -4508,7 +4508,7 @@ add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, have_nonksk = ISC_TRUE; } for (j = 0; j < nkeys; j++) { - if (j == i || ALG(keys[i]) != ALG(keys[j])) + if (j == i || ALG(keys[i]) != ALG(keys[j])) continue; if (REVOKE(keys[j])) continue; @@ -4843,7 +4843,7 @@ sign_a_node(dns_db_t *db, dns_name_t *name, dns_dbnode_t *node, isc_boolean_t build_nsec, dst_key_t *key, isc_stdtime_t inception, isc_stdtime_t expire, unsigned int minimum, isc_boolean_t is_ksk, - isc_boolean_t keyset_kskonly, isc_boolean_t *delegation, + isc_boolean_t keyset_kskonly, isc_boolean_t *delegation, dns_diff_t *diff, isc_int32_t *signatures, isc_mem_t *mctx) { isc_result_t result; @@ -6452,7 +6452,7 @@ zone_sign(dns_zone_t *zone) { for (j = 0; j < nkeys; j++) { if (j == i || ALG(zone_keys[i]) != - ALG(zone_keys[j])) + ALG(zone_keys[j])) continue; if (REVOKE(zone_keys[j])) continue;