4400. [bug] ttl policy was not being inherited in policy.py.

[RT #42718]

4400. [bug] ttl policy was not being inherited in policy.py.
[RT #42718]
50a3eae6 · Mark Andrews · 8d49a1a0 · 50a3eae6 · 50a3eae6
Commit 50a3eae6 authored Jun 27, 2016 by Mark Andrews
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

CHANGES CHANGES +3 -0

bin/python/isc/policy.py.in bin/python/isc/policy.py.in +6 -0

No files found.
--- a/CHANGES
+++ b/CHANGES
+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]

--- a/bin/python/isc/policy.py.in
+++ b/bin/python/isc/policy.py.in
@@ -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: