Mercurial > prosody-hg

comparison net/dns.lua @ 1815:e2f0c514d039

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 36b82873b9cb
children 1c0bde3db7d8 3e0e9f80010a
comparison
equal deleted inserted replaced
1814:846224d7a377 1815:e2f0c514d039
505 505
506 function resolver:adddefaultnameservers () -- - - - - adddefaultnameservers 506 function resolver:adddefaultnameservers () -- - - - - adddefaultnameservers
507 local resolv_conf = io.open("/etc/resolv.conf"); 507 local resolv_conf = io.open("/etc/resolv.conf");
508 if resolv_conf then 508 if resolv_conf then
509 for line in resolv_conf:lines() do 509 for line in resolv_conf:lines() do
510 local address = string.match (line, 'nameserver%s+(%d+%.%d+%.%d+%.%d+)') 510 local address = string.match (line, '^%s*nameserver%s+(%d+%.%d+%.%d+%.%d+)')
511 if address then self:addnameserver (address) end 511 if address then self:addnameserver (address) end
512 end 512 end
513 elseif os.getenv("WINDIR") then 513 elseif os.getenv("WINDIR") then
514 self:addnameserver ("208.67.222.222") 514 self:addnameserver ("208.67.222.222")
515 self:addnameserver ("208.67.220.220") 515 self:addnameserver ("208.67.220.220")
516 end 516 end