aboutsummaryrefslogtreecommitdiffstats
path: root/net/dns.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-05 18:35:02 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-05 18:35:02 +0000
commitf3d2b07f3f93458d5b5c348af576c7d2f317f16e (patch)
treec58364b5a626dd3ebe79dc4c3b37a73bd0e1076d /net/dns.lua
parent651f61921bc5a867fdba3337ae7541fa4feccf7d (diff)
parenta201db970b44ac05204b19aa1c3fa973ea6e2e2a (diff)
downloadprosody-f3d2b07f3f93458d5b5c348af576c7d2f317f16e.tar.gz
prosody-f3d2b07f3f93458d5b5c348af576c7d2f317f16e.zip
Merge with 0.7
Diffstat (limited to 'net/dns.lua')
-rw-r--r--net/dns.lua13
1 files changed, 9 insertions, 4 deletions
diff --git a/net/dns.lua b/net/dns.lua
index ca5f3c62..8855cc61 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -532,14 +532,19 @@ function resolver:adddefaultnameservers() -- - - - - adddefaultnameservers
if not self.server or #self.server == 0 then
-- TODO log warning about no nameservers, adding opendns servers as fallback
self:addnameserver("208.67.222.222");
- self:addnameserver("208.67.220.220") ;
+ self:addnameserver("208.67.220.220");
end
else -- posix
local resolv_conf = io.open("/etc/resolv.conf");
if resolv_conf then
for line in resolv_conf:lines() do
- local address = line:gsub("#.*$", ""):match('^%s*nameserver%s+(%d+%.%d+%.%d+%.%d+)%s*$');
- if address then self:addnameserver(address) end
+ line = line:gsub("#.*$", "")
+ :match('^%s*nameserver%s+(.*)%s*$');
+ if line then
+ line:gsub("%f[%d.](%d+%.%d+%.%d+%.%d+)%f[^%d.]", function (address)
+ self:addnameserver(address)
+ end);
+ end
end
end
if not self.server or #self.server == 0 then
@@ -796,7 +801,7 @@ function resolver:feed(sock, packet)
set(self.wanted, q.class, q.type, q.name, nil);
end
end
- end
+ end
return response;
end