From 525a3990cae9369b6ea034636216dd2028639d44 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Sat, 1 Nov 2008 01:55:22 -0400 Subject: [PATCH] Punt the passup option from the DNS since the zone file can be used for the same thing svn path=/trunk/packages/invirt-dns/; revision=1478 --- debian/changelog | 3 ++- invirt-dns | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b1ac8e..b34b96a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ invirt-dns (0.0.5) unstable; urgency=low * 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 Sat, 01 Nov 2008 00:48:53 -0400 + -- Evan Broder Sat, 01 Nov 2008 01:05:57 -0400 invirt-dns (0.0.4) unstable; urgency=low diff --git a/invirt-dns b/invirt-dns index 13e00d4..976a9a7 100755 --- a/invirt-dns +++ b/invirt-dns @@ -91,12 +91,6 @@ class DatabaseAuthority(common.ResolverBase): results.append(dns.RRHeader(domain, dns.SOA, dns.IN, 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: return defer.fail(failure.Failure(dns.AuthoritativeDomainError(name))) -- 1.7.9.5