3092. [bug] Signatures for records at the zone apex could go

			stale due to an incorrect timer setting. [RT #23769]

diff --git a/bin/named/update.c b/bin/named/update.c
index d8f2a511ef643bbccb05f7712e843d3bbaf5a471..b55881a4c0248c84c1967a173d52cc124c4a14dd 100644 (file)
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.151.12.15 2011/03/11 12:57:03 marka Exp $ */
+/* $Id: update.c,v 1.151.12.16 2011/03/26 00:47:01 each Exp $ */
 
 #include <config.h>
 
@@ -2406,7 +2406,7 @@ update_signatures(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
                                CHECK(add_placeholder_nsec(db, newver, name,
                                                           diff));
                        CHECK(add_exposed_sigs(client, zone, db, newver, name,
-                                              cut, diff, zone_keys, nkeys,
+                                              cut, &sig_diff, zone_keys, nkeys,
                                               inception, expire, check_ksk));
                }
        }
@@ -2567,7 +2567,7 @@ update_signatures(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
                                                  &nsec_diff));
                } else {
                        CHECK(add_exposed_sigs(client, zone, db, newver, name,
-                                              cut, diff, zone_keys, nkeys,
+                                              cut, &sig_diff, zone_keys, nkeys,
                                               inception, expire, check_ksk));
                        CHECK(dns_nsec3_addnsec3s(db, newver, name, nsecttl,
                                                  unsecure, &nsec_diff));

diff --git a/lib/dns/diff.c b/lib/dns/diff.c
index d52a59ec5c8bd85c0266218f7b540cf216a3c48a..68a8d0296215ed71a37a28189592224daaaa102e 100644 (file)
--- a/lib/dns/diff.c
+++ b/lib/dns/diff.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: diff.c,v 1.18.50.4 2011/03/12 04:57:26 tbox Exp $ */
+/* $Id: diff.c,v 1.18.50.5 2011/03/26 00:47:02 each Exp $ */
 
 /*! \file */
 
@@ -373,6 +373,15 @@ diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver,
                                                           diff->resign);
                                        dns_db_setsigningtime(db, modified,
                                                              resign);
+                                       if (diff->resign == 0 &&
+                                           (op == DNS_DIFFOP_ADDRESIGN ||
+                                            op == DNS_DIFFOP_DELRESIGN))
+                                               isc_log_write(
+                                                       DIFF_COMMON_LOGARGS,
+                                                       ISC_LOG_WARNING,
+                                                       "resign requested "
+                                                       "with 0 resign "
+                                                       "interval");
                                }
                        } else if (result == DNS_R_UNCHANGED) {
                                /*