aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-23 05:49:08 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-23 05:49:08 +0000
commit6db47b60f4574bc8e5a34eacac8a67ccd52107dd (patch)
tree6f3256e2c07bc9507b7cbcc9b1e110cc44fa752c /net
parent37c659a35c38d7302d24f80d72cb5b7c3bf4100a (diff)
parentf80397b3b84bd417676b799a3600b966f2944d38 (diff)
downloadprosody-6db47b60f4574bc8e5a34eacac8a67ccd52107dd.tar.gz
prosody-6db47b60f4574bc8e5a34eacac8a67ccd52107dd.zip
Merge from waqas
Diffstat (limited to 'net')
-rw-r--r--net/dns.lua15
1 files changed, 10 insertions, 5 deletions
diff --git a/net/dns.lua b/net/dns.lua
index 1d165de1..7364161e 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -502,11 +502,16 @@ function resolver:setnameserver (address) -- - - - - - - - - - setnameserver
function resolver:adddefaultnameservers () -- - - - - adddefaultnameservers
local resolv_conf = io.open("/etc/resolv.conf");
- if not resolv_conf then return nil; end
- for line in resolv_conf:lines() do
- local address = string.match (line, 'nameserver%s+(%d+%.%d+%.%d+%.%d+)')
- if address then self:addnameserver (address) end
- end end
+ if resolv_conf then
+ for line in resolv_conf:lines() do
+ local address = string.match (line, 'nameserver%s+(%d+%.%d+%.%d+%.%d+)')
+ if address then self:addnameserver (address) end
+ end
+ else -- FIXME correct for windows, using opendns nameservers for now
+ self:addnameserver ("208.67.222.222")
+ self:addnameserver ("208.67.220.220")
+ end
+end
function resolver:getsocket (servernum) -- - - - - - - - - - - - - getsocket