X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/2c2a6440b71e26d6921924d3b840e1c35f5e2079..82e153ac0aa4f3697db9d799a42fee4fcc198826:/code/validation.py?ds=inline diff --git a/code/validation.py b/code/validation.py index f28603c..fe6d7c8 100644 --- a/code/validation.py +++ b/code/validation.py @@ -7,7 +7,7 @@ import string import dns.resolver from invirt.database import Machine, NIC, Type, Disk, CDROM, Autoinstall from invirt.config import structs as config -from webcommon import InvalidInput +from invirt.common import InvalidInput MAX_MEMORY_TOTAL = 512 MAX_MEMORY_SINGLE = 256 @@ -273,13 +273,15 @@ def testName(user, name, machine=None): return None try: hostname = '%s.%s.' % (name, config.dns.domains[0]) + resolver = dns.resolver.Resolver() + resolver.nameservers = ['127.0.0.1'] try: - dns.resolver.query(hostname, 'A') + resolver.query(hostname, 'A') except dns.resolver.NoAnswer, e: # If we can get the TXT record, then we can verify it's # reserved. If this lookup fails, let it bubble up and be # dealt with - answer = dns.resolver.query(hostname, 'TXT') + answer = resolver.query(hostname, 'TXT') txt = answer[0].strings[0] if txt.startswith('reserved'): raise InvalidInput('name', name, 'The name you have requested has been %s. For more information, contact us at %s' % (txt, config.dns.contact))