2798. [bug] Addressed bugs in managed-keys initialization

			and rollover. [RT #20683]

diff --git a/CHANGES b/CHANGES
index 84149e947f8e3dc7fbc61ac919924cddc773cbfb..d724a51e78e5f98aeecd0705764638cbb033c07d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2798.  [bug]           Addressed bugs in managed-keys initialization 
+                       and rollover. [RT #20683]
+
 2797.  [bug]           Don't decrement the dispatch manager's maxbuffers.
                        [RT #20613]
 

diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h
index 97f8bbe9b0405409eb036564e3ddecacd38376d6..6512aa6fe1f7c24abf047f865d540c8b61cbb6b7 100644 (file)
--- a/lib/dns/include/dns/keytable.h
+++ b/lib/dns/include/dns/keytable.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keytable.h,v 1.18 2009/07/01 23:47:36 tbox Exp $ */
+/* $Id: keytable.h,v 1.19 2009/12/03 15:40:03 each Exp $ */
 
 #ifndef DNS_KEYTABLE_H
 #define DNS_KEYTABLE_H 1
@@ -350,6 +350,22 @@ dns_keytable_finddeepestmatch(dns_keytable_t *keytable, dns_name_t *name,
  *\li  Any other result indicates an error.
  */
 
+void
+dns_keytable_attachkeynode(dns_keytable_t *keytable, dns_keynode_t *source,
+                          dns_keynode_t **target)
+/*%<
+ * Attach a keynode and and increment the active_nodes counter in a
+ * corresponding keytable.
+ *
+ * Requires:
+ *
+ *\li  'keytable' is a valid keytable.
+ *
+ *\li  'source' is a valid keynode.
+ *
+ *\li  'target' is not null and '*target' is null.
+ */
+
 void
 dns_keytable_detachkeynode(dns_keytable_t *keytable,
                           dns_keynode_t **keynodep);
@@ -421,9 +437,15 @@ dns_keynode_attach(dns_keynode_t *source, dns_keynode_t **target);
 void
 dns_keynode_detach(isc_mem_t *mctx, dns_keynode_t **target);
 /*%<
- * Detach keynode.
+ * Detach a single keynode, without touching any keynodes that
+ * may be pointed to by its 'next' pointer
  */
 
+void
+dns_keynode_detachall(isc_mem_t *mctx, dns_keynode_t **target);
+/*%<
+ * Detach a keynode and all its succesors.
+ */
 ISC_LANG_ENDDECLS
 
 #endif /* DNS_KEYTABLE_H */

diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c
index d2cd6bd4d4151fbdea3ac970bb27a80c7f3d75ac..f5401fdd47cf317dba38de444e014b2214882dcd 100644 (file)
--- a/lib/dns/keytable.c
+++ b/lib/dns/keytable.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keytable.c,v 1.38 2009/07/13 23:47:42 tbox Exp $ */
+/* $Id: keytable.c,v 1.39 2009/12/03 15:40:02 each Exp $ */
 
 /*! \file */
 
@@ -36,7 +36,7 @@ free_keynode(void *node, void *arg) {
        dns_keynode_t *keynode = node;
        isc_mem_t *mctx = arg;
 
-       dns_keynode_detach(mctx, &keynode);
+       dns_keynode_detachall(mctx, &keynode);
 }
 
 isc_result_t
@@ -283,7 +283,7 @@ dns_keytable_deletekeynode(dns_keytable_t *keytable, dst_key_t *dstkey) {
        while (knode != NULL) {
                if (dst_key_compare(knode->key, dstkey) == ISC_TRUE)
                        break;
-               kprev = &knode;
+               kprev = &knode->next;
                knode = knode->next;
        }
 
@@ -482,6 +482,25 @@ dns_keytable_finddeepestmatch(dns_keytable_t *keytable, dns_name_t *name,
        return (result);
 }
 
+void
+dns_keytable_attachkeynode(dns_keytable_t *keytable, dns_keynode_t *source,
+                          dns_keynode_t **target)
+{
+       /*
+        * Give back a keynode found via dns_keytable_findkeynode().
+        */
+
+       REQUIRE(VALID_KEYTABLE(keytable));
+       REQUIRE(VALID_KEYNODE(source));
+       REQUIRE(target != NULL && *target == NULL);
+
+       LOCK(&keytable->lock);
+       keytable->active_nodes++;
+       UNLOCK(&keytable->lock);
+
+       dns_keynode_attach(source, target);
+}
+
 void
 dns_keytable_detachkeynode(dns_keytable_t *keytable, dns_keynode_t **keynodep)
 {
@@ -596,10 +615,20 @@ dns_keynode_detach(isc_mem_t *mctx, dns_keynode_t **keynode) {
        if (refs == 0) {
                if (node->key != NULL)
                        dst_key_free(&node->key);
-               if (node->next != NULL)
-                       dns_keynode_detach(mctx, &node->next);
                isc_refcount_destroy(&node->refcount);
                isc_mem_put(mctx, node, sizeof(dns_keynode_t));
        }
        *keynode = NULL;
 }
+
+void
+dns_keynode_detachall(isc_mem_t *mctx, dns_keynode_t **keynode) {
+       dns_keynode_t *next = NULL, *node = *keynode;
+       REQUIRE(VALID_KEYNODE(node));
+       while (node != NULL) {
+               next = node->next;
+               dns_keynode_detach(mctx, &node);
+               node = next;
+       }
+       *keynode = NULL;
+}

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 5f1b4c26005a44842aadd7c7427381f15f894512..dc4e6419e0d7b51ce64f9524603ad01abac6016b 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.533 2009/11/25 02:30:54 each Exp $ */
+/* $Id: zone.c,v 1.534 2009/12/03 15:40:02 each Exp $ */
 
 /*! \file */
 
@@ -2574,8 +2574,8 @@ set_refreshkeytimer(dns_zone_t *zone, dns_rdata_keydata_t *key,
  */
 static isc_result_t
 create_keydata(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
-              dns_diff_t *diff, dns_name_t *name, dns_keytable_t *keytable,
-              dns_keynode_t *keynode, isc_boolean_t *changed)
+              dns_diff_t *diff, dns_keytable_t *keytable,
+              dns_keynode_t **keynodep, isc_boolean_t *changed)
 {
        const char me[] = "create_keydata";
        isc_result_t result = ISC_R_SUCCESS;
@@ -2584,16 +2584,21 @@ create_keydata(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
        dns_rdata_keydata_t keydata;
        dns_rdata_dnskey_t dnskey;
        dns_rdata_t rdata = DNS_RDATA_INIT;
-       dns_keynode_t *nextnode = NULL;
+       dns_keynode_t *keynode;
        isc_stdtime_t now;
        isc_region_t r;
        dst_key_t *key;
 
+       REQUIRE(keynodep != NULL);
+       keynode = *keynodep;
+
        ENTER;
        isc_stdtime_get(&now);
 
        /* Loop in case there's more than one key. */
        while (result == ISC_R_SUCCESS) {
+               dns_keynode_t *nextnode = NULL;
+
                key = dns_keynode_key(keynode);
                if (key == NULL)
                        goto skip;
@@ -2621,12 +2626,12 @@ create_keydata(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
 
                /* Add rdata to zone. */
                CHECK(update_one_rr(db, ver, diff, DNS_DIFFOP_ADD,
-                                   name, 0, &rdata));
+                                   dst_key_name(key), 0, &rdata));
                *changed = ISC_TRUE;
 
  skip:
                result = dns_keytable_nextkeynode(keytable, keynode, &nextnode);
-               if(result != ISC_R_NOTFOUND) {
+               if (result != ISC_R_NOTFOUND) {
                        dns_keytable_detachkeynode(keytable, &keynode);
                        keynode = nextnode;
                }
@@ -2636,6 +2641,10 @@ create_keydata(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
        if (*changed)
                set_refreshkeytimer(zone, &keydata, now);
 
+       if (keynode != NULL)
+               dns_keytable_detachkeynode(keytable, &keynode);
+       *keynodep = NULL;
+
        return (ISC_R_SUCCESS);
 
   failure:
@@ -3099,12 +3108,12 @@ sync_keyzone(dns_zone_t *zone, dns_db_t *db) {
                        continue;
 
                result = dns_keytable_find(sr, rrname, &keynode);
-
                if ((result != ISC_R_SUCCESS &&
                     result != DNS_R_PARTIALMATCH) ||
                    dns_keynode_managed(keynode) == ISC_FALSE) {
                        CHECK(delete_keydata(db, ver, &diff,
                                             rrname, rdataset));
+                       changed = ISC_TRUE;
                } else {
                        load_secroots(zone, rrname, rdataset);
                }
@@ -3127,10 +3136,10 @@ sync_keyzone(dns_zone_t *zone, dns_db_t *db) {
                dns_rbtnode_t *rbtnode = NULL;
 
                dns_rbtnodechain_current(&chain, &foundname, origin, &rbtnode);
-               keynode = rbtnode->data;
-               if (keynode == NULL)
+               if (rbtnode->data == NULL)
                        goto skip;
 
+               dns_keytable_attachkeynode(sr, rbtnode->data, &keynode);
                if (dns_keynode_managed(keynode)) {
                        dns_fixedname_t fname;
                        dns_name_t *keyname;
@@ -3149,13 +3158,14 @@ sync_keyzone(dns_zone_t *zone, dns_db_t *db) {
                                             NULL, NULL);
                        if (result != ISC_R_SUCCESS)
                                result = create_keydata(zone, db, ver, &diff,
-                                                       keyname, sr, keynode,
-                                                       &changed);
+                                                       sr, &keynode, &changed);
                        if (result != ISC_R_SUCCESS)
                                break;
                }
   skip:
                result = dns_rbtnodechain_next(&chain, &foundname, origin);
+               if (keynode != NULL)
+                       dns_keytable_detachkeynode(sr, &keynode);
        }
        RWUNLOCK(&sr->rwlock, isc_rwlocktype_write);
 
@@ -3173,6 +3183,8 @@ sync_keyzone(dns_zone_t *zone, dns_db_t *db) {
        }
 
  failure:
+       if (keynode != NULL)
+               dns_keytable_detachkeynode(sr, &keynode);
        if (sr != NULL)
                dns_keytable_detach(&sr);
        if (ver != NULL)
@@ -7452,7 +7464,7 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) {
        }
 
        dns_diff_clear(&diff);
-       dns_db_closeversion(kfetch->db, &ver, alldone);
+       dns_db_closeversion(kfetch->db, &ver, changed);
        dns_db_detach(&kfetch->db);
 
        if (dns_rdataset_isassociated(&kfetch->keydataset))