[SCM] Samba Shared Repository - branch master updated

[Kai Blin]

The branch, master has been updated
       via  634f116 provision: Correctly provision the SOA record minimum TTL
      from  392ec4d bug #10609: CVE-2014-0239 Don't reply to replies

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 634f116fbb89d723a627f4501b4cd89342cecb8e
Author: Kai Blin <kai at samba.org>
Date:   Fri May 16 18:33:42 2014 +0200

    provision: Correctly provision the SOA record minimum TTL
    
    This fixes bug #10466
    
    Signed-off-by: Kai Blin <kai at samba.org>
    Reviewed-by: Guenter Kukkukk <kukks at samba.org>
    
    Autobuild-User(master): Kai Blin <kai at samba.org>
    Autobuild-Date(master): Wed May 21 10:55:00 CEST 2014 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 python/samba/provision/sambadns.py |    1 +
 python/samba/tests/dns.py          |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index 13e03ab..f1cb1e2 100644
--- a/python/samba/provision/sambadns.py
+++ b/python/samba/provision/sambadns.py
@@ -130,6 +130,7 @@ class SOARecord(dnsp.DnssrvRpcRecord):
         soa.expire = expire
         soa.mname = mname
         soa.rname = rname
+        soa.minimum = minimum
         self.data = soa
 
 
diff --git a/python/samba/tests/dns.py b/python/samba/tests/dns.py
index 400321f..f93e13f 100644
--- a/python/samba/tests/dns.py
+++ b/python/samba/tests/dns.py
@@ -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):


-- 
Samba Shared Repository