Fixed a bug that was exposed by change #3085.

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 7b7a81468e59bd821ac31a4b00030bfc5c6736a5..09c3876f9da31ee97256670a2106c64f82305a36 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -29,7 +29,7 @@
  * 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 */
 
@@ -369,8 +369,6 @@ keythatsigned(dns_rdata_rrsig_t *rrsig) {
        isc_result_t result;
        dst_key_t *pubkey = NULL, *privkey = NULL;
        dns_dnsseckey_t *key = NULL;
-       isc_stdtime_t delete;
-       isc_boolean_t delset = ISC_FALSE;
 
        isc_rwlock_lock(&keylist_lock, isc_rwlocktype_read);
        key = keythatsigned_unlocked(rrsig);
@@ -406,22 +404,15 @@ keythatsigned(dns_rdata_rrsig_t *rrsig) {
                                  directory, mctx, &privkey);
        if (result == ISC_R_SUCCESS) {
                dst_key_free(&pubkey);
-               dns_dnsseckey_create(mctx, &privkey, &key);
-       } else {
-               dns_dnsseckey_create(mctx, &pubkey, &key);
-       }
-
-       result = dst_key_gettime(key->key, DST_TIME_DELETE, &delete);
-       if (result == ISC_R_SUCCESS)
-               delset = ISC_TRUE;
+               result = dns_dnsseckey_create(mctx, &privkey, &key);
+       } else
+               result = dns_dnsseckey_create(mctx, &pubkey, &key);
 
-       if (delset && delete <= now)
+       if (result == ISC_R_SUCCESS) {
                key->force_publish = ISC_FALSE;
-       else
-               key->force_publish = ISC_TRUE;
-
-       key->force_sign = ISC_FALSE;
-       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);
        return (key);

diff --git a/bin/tests/system/logfileconfig/ns1/named.conf b/bin/tests/system/logfileconfig/ns1/named.conf
index 5fb93b70cddcc52e452b478b5c98dc1526ff0ebf..661374afe28947f767aec684ce487a2603138e04 100644 (file)
--- a/bin/tests/system/logfileconfig/ns1/named.conf
+++ b/bin/tests/system/logfileconfig/ns1/named.conf
@@ -14,7 +14,7 @@
  * 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 {
         query-source address 10.53.0.1;