|
Lines 42-48
Link Here
|
| 42 |
|
42 |
|
| 43 |
try: |
43 |
try: |
| 44 |
import DNS |
44 |
import DNS |
| 45 |
DNS.ParseResolvConf() |
45 |
DNS.DiscoverNameServers() |
| 46 |
have_dns=True |
46 |
have_dns=True |
| 47 |
except ImportError: |
47 |
except ImportError: |
| 48 |
have_dns=False |
48 |
have_dns=False |
|
Lines 1230-1237
Link Here
|
| 1230 |
if self.resolve_domain: |
1230 |
if self.resolve_domain: |
| 1231 |
assert have_dns, "pyDNS should be available" |
1231 |
assert have_dns, "pyDNS should be available" |
| 1232 |
try: |
1232 |
try: |
| 1233 |
a=DNS.DnsRequest(domain).req().answers |
1233 |
a=DNS.DnsRequest(domain, qtype='mx').req().answers |
| 1234 |
dnsdomains=[x['data'] for x in a if x['typename'] in ('A', 'MX')] |
1234 |
if not a: |
|
|
1235 |
a=DNS.DnsRequest(domain, qtype='a').req().answers |
| 1236 |
dnsdomains=[x['data'] for x in a] |
| 1235 |
except (socket.error, DNS.DNSError), e: |
1237 |
except (socket.error, DNS.DNSError), e: |
| 1236 |
raise Invalid( |
1238 |
raise Invalid( |
| 1237 |
self.message('socketError', state, error=e), |
1239 |
self.message('socketError', state, error=e), |
