prosody
e2f0c514d039
net/dns.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

net/dns.lua @ 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
parent 1809:36b82873b9cb
child 1816:1c0bde3db7d8
child 1820:3e0e9f80010a
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")