From 334b002da3b5340f8f618bc8f4e21d876dad2982 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 21 Sep 2009 14:42:01 +0100 Subject: net.dns: Accidentally committed a hard-coded 4.2.2.1 nameserver --- net/dns.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'net/dns.lua') diff --git a/net/dns.lua b/net/dns.lua index b5f87ad2..ff07d26e 100644 --- a/net/dns.lua +++ b/net/dns.lua @@ -504,7 +504,6 @@ function resolver:setnameserver (address) -- - - - - - - - - - setnameserver function resolver:adddefaultnameservers () -- - - - - adddefaultnameservers - self:addnameserver("4.2.2.1"); do return; end local resolv_conf = io.open("/etc/resolv.conf"); if resolv_conf then for line in resolv_conf:lines() do -- cgit v1.2.3 From e0c4e19bab9f19717c626bba804f2421823d2be7 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 24 Sep 2009 11:14:05 +0100 Subject: net.dns: Respect commented nameserver entries in resolv.conf (thanks Remko) --- net/dns.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net/dns.lua') 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") -- cgit v1.2.3