use documented default key ttl

(cherry picked from commit 6499bdfd8b6d21e981c875f87bfc80c2d13325d7)

diff --git a/bin/python/isc/dnskey.py.in b/bin/python/isc/dnskey.py.in
index 8c5a80f7c1bbca39a631143d8987c17236fc770f..8d7e8dbd816a7066aa6ab540b863813965a4c35a 100644 (file)
--- a/bin/python/isc/dnskey.py.in
+++ b/bin/python/isc/dnskey.py.in
@@ -452,6 +452,10 @@ class dnskey:
         if timespan is None:
             timespan = self.ttl
 
+        if timespan is None:
+            output("WARNING: Key %s using default TTL." % repr(self))
+            timespan = (60*60*24)
+
         now = time.time()
         d = self.delete()
         i = self.inactive()

diff --git a/bin/tests/system/coverage/12-ksk-deletion/expect b/bin/tests/system/coverage/12-ksk-deletion/expect
index abc24dffe00abefc65febbd715b6843bcb962c35..898c0bf0ba1d2e11570b96e8b46e79204f283f48 100644 (file)
--- a/bin/tests/system/coverage/12-ksk-deletion/expect
+++ b/bin/tests/system/coverage/12-ksk-deletion/expect
@@ -1,6 +1,6 @@
 args=
-warn=1
-error=0
-ok=0
-retcode=0
+warn=4
+error=1
+ok=1
+retcode=1
 match=0