From f1878f266675ad6f8003c3d514769f8d5984bc3a Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 23 Nov 2008 10:39:13 +0500 Subject: Check to prevent error on IQs from completely unhandled origins --- core/modulemanager.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 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 -- cgit v1.2.3 From f80397b3b84bd417676b799a3600b966f2944d38 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 23 Nov 2008 10:43:50 +0500 Subject: Added temporary fix for srv on windows: using opendns nameservers --- net/dns.lua | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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 -- cgit v1.2.3