diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-11-23 05:49:08 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-11-23 05:49:08 +0000 |
| commit | 6db47b60f4574bc8e5a34eacac8a67ccd52107dd (patch) | |
| tree | 6f3256e2c07bc9507b7cbcc9b1e110cc44fa752c | |
| parent | 37c659a35c38d7302d24f80d72cb5b7c3bf4100a (diff) | |
| parent | f80397b3b84bd417676b799a3600b966f2944d38 (diff) | |
| download | prosody-6db47b60f4574bc8e5a34eacac8a67ccd52107dd.tar.gz prosody-6db47b60f4574bc8e5a34eacac8a67ccd52107dd.zip | |
Merge from waqas
| -rw-r--r-- | core/modulemanager.lua | 4 | ||||
| -rw-r--r-- | net/dns.lua | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index b0fb6cd9..d313130c 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -92,8 +92,8 @@ function handle_stanza(origin, stanza) if child then local xmlns = child.attr.xmlns or xmlns; log("debug", "Stanza of type %s from %s has xmlns: %s", name, origin_type, xmlns); - local handler = handlers[origin_type][name][xmlns]; - if handler then + local handler = handlers[origin_type][name] and handlers[origin_type][name][xmlns]; + if handler then log("debug", "Passing stanza to mod_%s", handler_info[handler].name); return handler(origin, stanza) or true; end diff --git a/net/dns.lua b/net/dns.lua index 1d165de1..7364161e 100644 --- a/net/dns.lua +++ b/net/dns.lua @@ -502,11 +502,16 @@ function resolver:setnameserver (address) -- - - - - - - - - - setnameserver function resolver:adddefaultnameservers () -- - - - - adddefaultnameservers local resolv_conf = io.open("/etc/resolv.conf"); - if not resolv_conf then return nil; end - 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 - end end + 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 + end + else -- FIXME correct for windows, using opendns nameservers for now + self:addnameserver ("208.67.222.222") + self:addnameserver ("208.67.220.220") + end +end function resolver:getsocket (servernum) -- - - - - - - - - - - - - getsocket |