X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dns.git/blobdiff_plain/5642f61da008d892748a486926176db3521e0f0a..refs/heads/mitchb:/invirt-dns

diff --git a/invirt-dns b/invirt-dns
index 2b920bd..b540ff7 100755
--- a/invirt-dns
+++ b/invirt-dns
@@ -154,13 +154,13 @@ class DatabaseAuthority(common.ResolverBase):
                 record = dns.Record_A(ip, ttl)
                 results.append(dns.RRHeader(name, 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))
-            elif other and type == dns.TXT:
+            if other and type in (dns.TXT, dns.ALL_RECORDS):
                 record = dns.Record_TXT(action if action else '', ttl=ttl)
                 results.append(dns.RRHeader(name, dns.TXT, dns.IN,
                                             ttl, record, auth=True))
+            if type == dns.SOA:
+                results.append(dns.RRHeader(domain, dns.SOA, dns.IN,
+                                            ttl, self.soa, auth=True))
 
         if len(results) == 0:
             authority = []