]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
4400. [bug] ttl policy was not being inherited in policy.py.
authorMark Andrews <marka@isc.org>
Mon, 27 Jun 2016 03:07:45 +0000 (13:07 +1000)
committerMark Andrews <marka@isc.org>
Mon, 27 Jun 2016 03:07:45 +0000 (13:07 +1000)
                        [RT #42718]

CHANGES
bin/python/isc/policy.py.in

diff --git a/CHANGES b/CHANGES
index f73ecbf4e64883956dcc2294589cca7df4bceab1..de55fcf8a5503297e36fa9e79d6d16c624c0ee23 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4400.  [bug]           ttl policy was not being inherited in policy.py.
+                       [RT #42718]
+
 4399.  [bug]           policy.py 'ECCGOST', 'ECDSAP256SHA256', and
                        'ECDSAP384SHA384' don't have settable keysize.
                        [RT #42718]
index 99e820a75e858a919fbd32f561c03e5fcbfefc3e..7cced86f7a1a4744fc5a3bf68d0c9250fa41ea6b 100644 (file)
@@ -493,6 +493,12 @@ class dnssec_policy:
             p.zsk_postpublish = parent and \
                 parent.zsk_postpublish or ap.zsk_postpublish
 
+        if p.keyttl is None:
+            parent = p.parent or self.named_policy['default']
+            while parent is not None and not parent.keyttl:
+                parent = parent.parent
+            p.keyttl = parent and parent.keyttl
+
         if 'novalidate' not in kwargs or not kwargs['novalidate']:
             (valid, msg) = p.validate()
             if not valid: