Software / code / prosody
Changeset
1815:e2f0c514d039
net.dns: Respect commented nameserver entries in resolv.conf (thanks Remko)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 24 Sep 2009 11:14:05 +0100 |
| parents | 1814:846224d7a377 |
| children | 1816:1c0bde3db7d8 1820:3e0e9f80010a |
| files | net/dns.lua |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/net/dns.lua Wed Sep 23 13:17:13 2009 +0100 +++ b/net/dns.lua Thu Sep 24 11:14:05 2009 +0100 @@ -507,8 +507,8 @@ 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")
