From: Mark Andrews <marka@isc.org>
Date: Mon, 26 Nov 2018 06:24:03 +0000 (+1100)
Subject: use documented default key ttl
X-Git-Tag: v9.13.5~25^2~1
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=6499bdfd8b6d21e981c875f87bfc80c2d13325d7;p=thirdparty%2Fbind9.git

use documented default key ttl
---

diff --git a/bin/python/isc/dnskey.py.in b/bin/python/isc/dnskey.py.in
index eaedb80d999..83017c457fd 100644
--- 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 abc24dffe00..898c0bf0ba1 100644
--- 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