From: Evan Broder <broder@mit.edu>
Date: Mon, 23 Jun 2008 18:15:07 +0000 (-0400)
Subject: Always return an additional section
X-Git-Tag: sipb-xen-dns/1.02~6
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dns.git/commitdiff_plain/398392f6ac97ad8260c8bb65ce7359ce895310e3?ds=inline

Always return an additional section

svn path=/trunk/packages/sipb-xen-dns/; revision=645
---

diff --git a/code/dnsserver.py b/code/dnsserver.py
index 9864731..dc7c918 100755
--- a/code/dnsserver.py
+++ b/code/dnsserver.py
@@ -26,6 +26,10 @@ class DatabaseAuthority(common.ResolverBase):
                                   serial=1, refresh=3600, retry=900,
                                   expire=3600000, minimum=21600, ttl=3600)
         self.ns = dns.Record_NS(name='ns1.xvm.mit.edu', ttl=3600)
+        record = dns.Record_A(address='18.181.0.62', ttl=3600)
+        self.ns1 = dns.RRHeader('ns1.xvm.mit.edu', dns.A, dns.IN,
+                                3600, record, auth=True)
+
     
     def _lookup(self, name, cls, type, timeout = None):
         for i in range(3):
@@ -55,7 +59,7 @@ class DatabaseAuthority(common.ResolverBase):
                 return defer.fail(failure.Failure(dns.DomainError(name)))
         results = []
         authority = []
-        additional = []
+        additional = [self.ns1]
         authority.append(dns.RRHeader(domain, dns.NS, dns.IN,
                                       3600, self.ns, auth=True))
         if cls == dns.IN:
@@ -79,9 +83,6 @@ class DatabaseAuthority(common.ResolverBase):
                 results.append(dns.RRHeader(domain, dns.NS, dns.IN,
                                             ttl, self.ns, auth=True))
                 authority = []
-                record = dns.Record_A(address='18.181.0.62', ttl=ttl)
-                additional.append(dns.RRHeader('ns1.xvm.mit.edu', dns.A, dns.IN,
-                                               ttl, record, auth=True))
             elif type == dns.SOA:
                 results.append(dns.RRHeader(domain, dns.SOA, dns.IN,
                                             ttl, self.soa, auth=True))