Merge 0.10->trunk

[prosody.git] / core / hostmanager.lua

diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 53c1cd4eeaa4cd72b54507952ad1401738f60553..d7a585f9b01db5a2b4201dc8c95be0a7f74e962f 100644 (file)
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -12,8 +12,6 @@ local events_new = require "util.events".new;
 local disco_items = require "util.multitable".new();
 local NULL = {};
 
-local jid_split = require "util.jid".split;
-
 local log = require "util.logger".init("hostmanager");
 
 local hosts = prosody.hosts;
@@ -24,7 +22,7 @@ end
 local incoming_s2s = _G.prosody.incoming_s2s;
 local core_route_stanza = _G.prosody.core_route_stanza;
 
-local pairs, select, rawget = pairs, select, rawget;
+local pairs, rawget = pairs, rawget;
 local tostring, type = tostring, type;
 local setmetatable = setmetatable;
 
@@ -71,13 +69,6 @@ end
 prosody_events.add_handler("server-starting", load_enabled_hosts);
 
 local function host_send(stanza)
-       local name, stanza_type = stanza.name, stanza.attr.type;
-       if stanza_type == "error" or (name == "iq" and stanza_type == "result") then
-               local dest_host_name = select(2, jid_split(stanza.attr.to));
-               local dest_host = hosts[dest_host_name] or { type = "unknown" };
-               log("warn", "Unhandled response sent to %s host %s: %s", dest_host.type, dest_host_name, tostring(stanza));
-               return;
-       end
        core_route_stanza(nil, stanza);
 end