diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-09-24 11:16:25 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-09-24 11:16:25 +0100 |
| commit | 801957dc9674d71b01f56e37d15ac6ae12134588 (patch) | |
| tree | 55b3940b2a750f2941e98376709b21663aa97dd3 /net | |
| parent | 68cbd6d4b0d8673edc08d42d61ab6c6603470c36 (diff) | |
| parent | e0c4e19bab9f19717c626bba804f2421823d2be7 (diff) | |
| download | prosody-801957dc9674d71b01f56e37d15ac6ae12134588.tar.gz prosody-801957dc9674d71b01f56e37d15ac6ae12134588.zip | |
Merge with 0.5
Diffstat (limited to 'net')
| -rw-r--r-- | net/dns.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dns.lua b/net/dns.lua index ff07d26e..da06ceaa 100644 --- a/net/dns.lua +++ b/net/dns.lua @@ -507,8 +507,8 @@ function resolver:adddefaultnameservers () -- - - - - adddefaultnameservers local resolv_conf = io.open("/etc/resolv.conf"); 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 + local address = string.match (line, '^%s*nameserver%s+(%d+%.%d+%.%d+%.%d+)') + if address then self:addnameserver (address) end end elseif os.getenv("WINDIR") then self:addnameserver ("208.67.222.222") |