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

Fixed a bug that was exposed by change #3085.

Browse Source
This commit is contained in:
Evan Hunt
2011-03-22 03:19:38 +00:00
parent d72ac59bf2
commit c2255e8614
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@
* IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dnssec-signzone.c,v 1.273 2011/03/21 16:17:57 each Exp $ */ /* $Id: dnssec-signzone.c,v 1.274 2011/03/22 03:19:38 each Exp $ */
/*! \file */ /*! \file */
@@ -369,8 +369,6 @@ keythatsigned(dns_rdata_rrsig_t *rrsig) {
isc_result_t result; isc_result_t result;
dst_key_t *pubkey = NULL, *privkey = NULL; dst_key_t *pubkey = NULL, *privkey = NULL;
dns_dnsseckey_t *key = NULL; dns_dnsseckey_t *key = NULL;
isc_stdtime_t delete;
isc_boolean_t delset = ISC_FALSE;
isc_rwlock_lock(&keylist_lock, isc_rwlocktype_read); isc_rwlock_lock(&keylist_lock, isc_rwlocktype_read);
key = keythatsigned_unlocked(rrsig); key = keythatsigned_unlocked(rrsig);
@@ -406,22 +404,15 @@ keythatsigned(dns_rdata_rrsig_t *rrsig) {
directory, mctx, &privkey); directory, mctx, &privkey);
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
dst_key_free(&pubkey); dst_key_free(&pubkey);
dns_dnsseckey_create(mctx, &privkey, &key); result = dns_dnsseckey_create(mctx, &privkey, &key);
} else { } else
dns_dnsseckey_create(mctx, &pubkey, &key); result = dns_dnsseckey_create(mctx, &pubkey, &key);
}
result = dst_key_gettime(key->key, DST_TIME_DELETE, &delete); if (result == ISC_R_SUCCESS) {
if (result == ISC_R_SUCCESS)
delset = ISC_TRUE;
if (delset && delete <= now)
key->force_publish = ISC_FALSE; key->force_publish = ISC_FALSE;
else key->force_sign = ISC_FALSE;
key->force_publish = ISC_TRUE; ISC_LIST_APPEND(keylist, key, link);
}
key->force_sign = ISC_FALSE;
ISC_LIST_APPEND(keylist, key, link);
isc_rwlock_unlock(&keylist_lock, isc_rwlocktype_write); isc_rwlock_unlock(&keylist_lock, isc_rwlocktype_write);
return (key); return (key);

2
bin/tests/system/logfileconfig/ns1/named.conf
View File

@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: named.conf,v 1.6 2011/03/21 19:54:02 each Exp $ */ /* $Id: named.conf,v 1.7 2011/03/22 03:19:38 each Exp $ */
options { options {
query-source address 10.53.0.1; query-source address 10.53.0.1;