From: Bob Halley Date: Mon, 1 Sep 2014 00:02:56 +0000 (-0700) Subject: Fix exception when reading from a masterfile. X-Git-Tag: v1.12.0-py3~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b87ddf4414b54d4ef1f0b033d99b66743e5847d8;p=thirdparty%2Fdnspython.git Fix exception when reading from a masterfile. --- diff --git a/dns/zone.py b/dns/zone.py index a5f4f9c1..9a8fc226 100644 --- a/dns/zone.py +++ b/dns/zone.py @@ -565,7 +565,7 @@ class _MasterReader(object): self.current_origin = origin self.relativize = relativize self.ttl = 0 - self.last_name = None + self.last_name = self.current_origin self.zone = zone_factory(origin, rdclass, relativize=relativize) self.saved_state = [] self.current_file = None diff --git a/tests/zone.py b/tests/zone.py index 61f41480..67fc2ae6 100644 --- a/tests/zone.py +++ b/tests/zone.py @@ -394,5 +394,14 @@ class ZoneTestCase(unittest.TestCase): relativize=True) self.assertRaises(dns.exception.SyntaxError, bad) + def testFirstRRStartsWithWhitespace(self): + # no name is specified, so default to the intial origin + # no ttl is specified, so default to the initial TTL of 0 + z = dns.zone.from_text(' IN A 10.0.0.1', origin='example.', + check_origin=False) + n = z['@'] + rds = n.get_rdataset(dns.rdataclass.IN, dns.rdatatype.A) + self.assertTrue(rds.ttl == 0) + if __name__ == '__main__': unittest.main()