3073. [bug] managed-keys changes were not properly being recorded.

                        [RT #20256]

diff --git a/CHANGES b/CHANGES
index 33deb973c17fca99dadcb8642a05644cd4339bbb..211eae70f32a510fe5c9f00c4da881b0540c0e83 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3073.  [bug]           managed-keys changes were not properly being recorded.
+                       [RT #20256]
+
 3072.  [bug]           dns_dns64_aaaaok() potential NULL pointer dereference.
                        [RT #20256]
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 73c52e91a8686224db52ae6678fe734fdc7d6a69..aee856dcdcef473c9c65f0480412d0ab3d707f9d 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.582.8.11 2011/03/11 06:47:06 marka Exp $ */
+/* $Id: zone.c,v 1.582.8.12 2011/03/11 13:22:40 marka Exp $ */
 
 /*! \file */
 
@@ -3131,6 +3131,7 @@ static isc_result_t
 sync_keyzone(dns_zone_t *zone, dns_db_t *db) {
        isc_result_t result = ISC_R_SUCCESS;
        isc_boolean_t changed = ISC_FALSE;
+       isc_boolean_t commit = ISC_FALSE;
        dns_rbtnodechain_t chain;
        dns_fixedname_t fn;
        dns_name_t foundname, *origin;
@@ -3252,12 +3253,12 @@ sync_keyzone(dns_zone_t *zone, dns_db_t *db) {
 
        if (changed) {
                /* Write changes to journal file. */
-               result = increment_soa_serial(db, ver, &diff, zone->mctx);
-               if (result == ISC_R_SUCCESS)
-                       zone_journal(zone, &diff, "sync_keyzone");
+               CHECK(increment_soa_serial(db, ver, &diff, zone->mctx));
+               CHECK(zone_journal(zone, &diff, "sync_keyzone"));
 
                DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_LOADED);
                zone_needdump(zone, 30);
+               commit = ISC_TRUE;
        }
 
  failure:
@@ -3266,7 +3267,7 @@ sync_keyzone(dns_zone_t *zone, dns_db_t *db) {
        if (sr != NULL)
                dns_keytable_detach(&sr);
        if (ver != NULL)
-               dns_db_closeversion(db, &ver, changed);
+               dns_db_closeversion(db, &ver, commit);
        dns_diff_clear(&diff);
 
        return (result);
@@ -7177,8 +7178,8 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) {
        dns_keytable_t *secroots = NULL;
        dns_dbversion_t *ver = NULL;
        dns_diff_t diff;
-       isc_boolean_t changed = ISC_FALSE;
        isc_boolean_t alldone = ISC_FALSE;
+       isc_boolean_t commit = ISC_FALSE;
        dns_name_t *keyname;
        dns_rdata_t sigrr = DNS_RDATA_INIT;
        dns_rdata_t dnskeyrr = DNS_RDATA_INIT;
@@ -7238,8 +7239,7 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) {
                             "Unable to fetch DNSKEY set "
                             "'%s': %s", namebuf, dns_result_totext(eresult));
                CHECK(minimal_update(kfetch, ver, &diff));
-               changed = ISC_TRUE;
-               goto failure;
+               goto done;
        }
 
        /* No RRSIGs found */
@@ -7248,8 +7248,7 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) {
                             "No DNSKEY RRSIGs found for "
                             "'%s': %s", namebuf, dns_result_totext(eresult));
                CHECK(minimal_update(kfetch, ver, &diff));
-               changed = ISC_TRUE;
-               goto failure;
+               goto done;
        }
 
        /*
@@ -7377,7 +7376,6 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) {
                                CHECK(update_one_rr(kfetch->db, ver, &diff,
                                                    DNS_DIFFOP_DEL, keyname, 0,
                                                    &keydatarr));
-                               changed = ISC_TRUE;
                        }
 
                        if (!secure || deletekey)
@@ -7393,7 +7391,6 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) {
                        CHECK(update_one_rr(kfetch->db, ver, &diff,
                                            DNS_DIFFOP_ADD, keyname, 0,
                                            &keydatarr));
-                       changed = ISC_TRUE;
 
                        set_refreshkeytimer(zone, &keydata, now);
                }
@@ -7517,12 +7514,10 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) {
                }
 
                /* Delete old version */
-               if (deletekey || !newkey) {
+               if (deletekey || !newkey)
                        CHECK(update_one_rr(kfetch->db, ver, &diff,
                                            DNS_DIFFOP_DEL, keyname, 0,
                                            &keydatarr));
-                       changed = ISC_TRUE;
-               }
 
                if (updatekey) {
                        /* Set refresh timer */
@@ -7537,7 +7532,6 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) {
                        CHECK(update_one_rr(kfetch->db, ver, &diff,
                                            DNS_DIFFOP_ADD, keyname, 0,
                                            &keydatarr));
-                       changed = ISC_TRUE;
                } else if (newkey) {
                        /* Convert DNSKEY to KEYDATA */
                        dns_rdata_tostruct(&dnskeyrr, &dnskey, NULL);
@@ -7555,7 +7549,6 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) {
                        CHECK(update_one_rr(kfetch->db, ver, &diff,
                                            DNS_DIFFOP_ADD, keyname, 0,
                                            &keydatarr));
-                       changed = ISC_TRUE;
                }
 
                if (trustkey) {
@@ -7580,23 +7573,23 @@ keyfetch_done(isc_task_t *task, isc_event_t *event) {
        if (pending != 0)
                fail_secure(zone, keyname);
 
-  failure:
-       if (changed) {
+ done:
+
+       if (!ISC_LIST_EMPTY(diff.tuples)) {
+               /* Write changes to journal file. */
+               CHECK(increment_soa_serial(kfetch->db, ver, &diff, mctx));
+               CHECK(zone_journal(zone, &diff, "keyfetch_done"));
+               commit = ISC_TRUE;
+
                DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_LOADED);
                zone_needdump(zone, 30);
        }
 
+  failure:
        UNLOCK_ZONE(zone);
 
-       /* Write changes to journal file. */
-       if (alldone) {
-               result = increment_soa_serial(kfetch->db, ver, &diff, mctx);
-               if (result == ISC_R_SUCCESS)
-                       result = zone_journal(zone, &diff, "keyfetch_done");
-       }
-
        dns_diff_clear(&diff);
-       dns_db_closeversion(kfetch->db, &ver, changed);
+       dns_db_closeversion(kfetch->db, &ver, commit);
        dns_db_detach(&kfetch->db);
        dns_zone_detach(&kfetch->zone);
 
@@ -7724,8 +7717,8 @@ zone_refreshkeys(dns_zone_t *zone) {
        }
        if (!ISC_LIST_EMPTY(diff.tuples)) {
                CHECK(increment_soa_serial(db, ver, &diff, zone->mctx));
+               CHECK(zone_journal(zone, &diff, "sync_keyzone"));
                commit = ISC_TRUE;
-               zone_journal(zone, &diff, "sync_keyzone");
                DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_LOADED);
                zone_needdump(zone, 30);
        }