From 03176dea4c56ede85c34cf6bec127c96c85a8bf4 Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Sat, 5 Jan 2019 06:46:29 -0800 Subject: [PATCH] If reading /etc/resolv.conf fails, or finds no servers, raise NoResolverConfiguration [Issue #332] --- dns/resolver.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dns/resolver.py b/dns/resolver.py index 74828bd1..dc40efa7 100644 --- a/dns/resolver.py +++ b/dns/resolver.py @@ -180,6 +180,8 @@ class NoRootSOA(dns.exception.DNSException): class NoMetaqueries(dns.exception.DNSException): """DNS metaqueries are not allowed.""" +class NoResolverConfiguration(dns.exception.DNSException): + """Resolver configuration could not be read or specified no nameservers.""" class Answer(object): """DNS stub resolver answer. @@ -576,9 +578,7 @@ class Resolver(object): f = open(f, 'r') except IOError: # /etc/resolv.conf doesn't exist, can't be read, etc. - # We'll just use the default resolver configuration. - self.nameservers = ['127.0.0.1'] - return + raise NoResolverConfiguration want_close = True else: want_close = False @@ -606,7 +606,7 @@ class Resolver(object): if want_close: f.close() if len(self.nameservers) == 0: - self.nameservers.append('127.0.0.1') + raise NoResolverConfiguration def _determine_split_char(self, entry): # -- 2.47.3