provision: Correctly provision the SOA record minimum TTL
authorKai Blin <kai@samba.org>
Fri, 16 May 2014 16:33:42 +0000 (18:33 +0200)
committerKarolin Seeger <kseeger@samba.org>
Mon, 8 Sep 2014 05:49:09 +0000 (07:49 +0200)
This fixes bug #10466

Signed-off-by: Kai Blin <kai@samba.org>
Reviewed-by: Guenter Kukkukk <kukks@samba.org>
Autobuild-User(master): Kai Blin <kai@samba.org>
Autobuild-Date(master): Wed May 21 10:55:00 CEST 2014 on sn-devel-104

(cherry picked from commit 634f116fbb89d723a627f4501b4cd89342cecb8e)

python/samba/provision/sambadns.py
python/samba/tests/dns.py

index 53f1082608095baf2cac90f3e1982142a40a6f01..ce4a46a8ecc6ad89e3ca51980c89fe40425d867e 100644 (file)
@@ -125,6 +125,7 @@ class SOARecord(dnsp.DnssrvRpcRecord):
         soa.expire = expire
         soa.mname = mname
         soa.rname = rname
+        soa.minimum = minimum
         self.data = soa
 
 
index 79e4158b67b4224374e30a13fff119ca82e458b1..2983de34ac5751953689a49421f6841d629db1bb 100644 (file)
@@ -289,6 +289,7 @@ class TestSimpleQueries(DNSTest):
         self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
         self.assert_dns_opcode_equals(response, dns.DNS_OPCODE_QUERY)
         self.assertEquals(response.ancount, 1)
+        self.assertEquals(response.answers[0].rdata.minimum, 3600)
 
 
 class TestDNSUpdates(DNSTest):