Index: trunk/packages/invirt-dns/debian/changelog
===================================================================
--- trunk/packages/invirt-dns/debian/changelog	(revision 1477)
+++ trunk/packages/invirt-dns/debian/changelog	(revision 1478)
@@ -3,6 +3,7 @@
   * Instead of hacking in support for prod.xvm.mit.edu, support zone files
     that override the database
+  * Punt passup option as it can be handled by the zone file
 
- -- Evan Broder <broder@mit.edu>  Sat, 01 Nov 2008 00:48:53 -0400
+ -- Evan Broder <broder@mit.edu>  Sat, 01 Nov 2008 01:05:57 -0400
 
 invirt-dns (0.0.4) unstable; urgency=low
Index: trunk/packages/invirt-dns/invirt-dns
===================================================================
--- trunk/packages/invirt-dns/invirt-dns	(revision 1477)
+++ trunk/packages/invirt-dns/invirt-dns	(revision 1478)
@@ -92,10 +92,4 @@
                                                 ttl, self.soa, auth=True))
             else: # Request for a subdomain.
-                if 'passup' in dir(config.dns) and host in config.dns.passup:
-                    record = dns.Record_CNAME('%s.%s' % (host, config.dns.parent), ttl)
-                    return defer.succeed((
-                        [dns.RRHeader(name, dns.CNAME, dns.IN, ttl, record, auth=True)],
-                        [], []))
-
                 value = invirt.database.Machine.query().filter_by(name=host).first()
                 if value is None or not value.nics: