From 5ee79f833eb2ad14bd74b7d1d02a22d65b759668 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 26 Nov 2018 17:24:03 +1100 Subject: [PATCH] use documented default key ttl (cherry picked from commit 6499bdfd8b6d21e981c875f87bfc80c2d13325d7) --- bin/python/isc/dnskey.py.in | 4 ++++ bin/tests/system/coverage/12-ksk-deletion/expect | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/python/isc/dnskey.py.in b/bin/python/isc/dnskey.py.in index 8c5a80f7c1..8d7e8dbd81 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 abc24dffe0..898c0bf0ba 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