From: tmerila <tuomas@merila.org>
Date: Wed, 3 Apr 2019 11:38:25 +0000 (+0300)
Subject: Update zone.py
X-Git-Tag: v2.0.0rc1~352^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F363%2Fhead;p=thirdparty%2Fdnspython.git

Update zone.py

Check for self.last_ttl_known before setting ttl = self.last_ttl so it will remain None instead of 0 if value is not known.
---

diff --git a/dns/zone.py b/dns/zone.py
index 7f5cb60d..1989d1a7 100644
--- a/dns/zone.py
+++ b/dns/zone.py
@@ -671,9 +671,9 @@ class _MasterReader(object):
         except dns.ttl.BadTTL:
             if self.default_ttl_known:
                 ttl = self.default_ttl
-            else:
+            elif self.last_ttl_known:
                 ttl = self.last_ttl
-                
+
         # Class
         try:
             rdclass = dns.rdataclass.from_text(token.value)
@@ -729,7 +729,7 @@ class _MasterReader(object):
                     ttl = self.default_ttl
                 else:
                     ttl = self.last_ttl
-            
+
         rd.choose_relativity(self.zone.origin, self.relativize)
         covers = rd.covers()
         rds = n.find_rdataset(rdclass, rdtype, covers, True)