Index: trunk/packages/sipb-xen-dns/code/dnsserver.py
===================================================================
--- trunk/packages/sipb-xen-dns/code/dnsserver.py	(revision 650)
+++ trunk/packages/sipb-xen-dns/code/dnsserver.py	(revision 651)
@@ -65,11 +65,19 @@
                                       3600, self.ns, auth=True))
         if cls == dns.IN:
-            if type in (dns.A, dns.ALL_RECORDS):
-                host = name[:-len(domain)-1]
-                if not host:
+            host = name[:-len(domain)-1]
+            if not host:
+                if type in (dns.A, dns.ALL_RECORDS):
                     record = dns.Record_A('18.181.0.62', ttl)
                     results.append(dns.RRHeader(name, dns.A, dns.IN, 
                                                 ttl, record, auth=True))
-                else:
+                elif type == dns.NS:
+                    results.append(dns.RRHeader(domain, dns.NS, dns.IN,
+                                                ttl, self.ns, auth=True))
+                    authority = []
+                elif type == dns.SOA:
+                    results.append(dns.RRHeader(domain, dns.SOA, dns.IN,
+                                                ttl, self.soa, auth=True))
+            else:
+                if host:
                     value = sipb_xen_database.Machine.get_by(name=host)
                     if value is None or not value.nics:
@@ -78,14 +86,11 @@
                     if ip is None:  #Deactivated?
                         return defer.fail(failure.Failure(dns.AuthoritativeDomainError(name)))
+                if type in (dns.A, dns.ALL_RECORDS):
                     record = dns.Record_A(ip, ttl)
                     results.append(dns.RRHeader(name, dns.A, dns.IN, 
                                                 ttl, record, auth=True))
-            elif type == dns.NS:
-                results.append(dns.RRHeader(domain, dns.NS, dns.IN,
-                                            ttl, self.ns, auth=True))
-                authority = []
-            elif type == dns.SOA:
-                results.append(dns.RRHeader(domain, dns.SOA, dns.IN,
-                                            ttl, self.soa, auth=True))
+                elif type == dns.SOA:
+                    results.append(dns.RRHeader(domain, dns.SOA, dns.IN,
+                                                ttl, self.soa, auth=True))
             if len(results) == 0:
                 authority = []