2990. [bug] 'dnssec-settime -S' no longer tests prepublication

			interval validity when the interval is set to 0.
			[RT #22761]

diff --git a/CHANGES b/CHANGES
index d6c7e566354646c84370a55b582f04de1cb38322..6b4d776e10e84d095a4da01915d167509cbee37c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2990.  [bug]           'dnssec-settime -S' no longer tests prepublication
+                       interval validity when the interval is set to 0.
+                       [RT #22761]
+
 2989.  [func]          Added support for writable DLZ zones. (Contributed
                        by Andrew Tridgell of the Samba project.) [RT #22629]
 

diff --git a/bin/dnssec/dnssec-settime.c b/bin/dnssec/dnssec-settime.c
index 051b649673e47bb1f3b6a055b1de0e740466bd61..7791db01e0083abf1e20598b51ccaad26f2b52b4 100644 (file)
--- a/bin/dnssec/dnssec-settime.c
+++ b/bin/dnssec/dnssec-settime.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-settime.c,v 1.27 2010/08/16 23:46:51 tbox Exp $ */
+/* $Id: dnssec-settime.c,v 1.28 2010/12/19 07:29:36 each Exp $ */
 
 /*! \file */
 
@@ -386,7 +386,7 @@ main(int argc, char **argv) {
                              "generating a successor.");
 
                pub = act - prepub;
-               if (pub < now)
+               if (pub < now && prepub != 0)
                        fatal("Predecessor will become inactive before the\n\t"
                              "prepublication period ends.  Either change "
                              "its inactivation date,\n\t"