Mercurial > prosody-hg
diff net/dns.lua @ 1806:c55e06eb53b2
Merge with 0.5
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 21 Sep 2009 14:42:29 +0100 |
| parents | 45779d67c26c 7e41ad68fe3c |
| children | 3bb0e5170692 |
line wrap: on
line diff
--- a/net/dns.lua Sun Sep 20 21:30:20 2009 +0100 +++ b/net/dns.lua Mon Sep 21 14:42:29 2009 +0100 @@ -504,6 +504,7 @@ 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
