Merge 0.9->0.10

[prosody.git] / core / hostmanager.lua

diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 91b052d1725b303e5f69a1f7a57fa36ac76c4769..d7329cd26160b413cc07ecbd5d256d37b8baddc3 100644 (file)
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -13,7 +13,6 @@ local disco_items = require "util.multitable".new();
 local NULL = {};
 
 local jid_split = require "util.jid".split;
-local uuid_gen = require "util.uuid".generate;
 
 local log = require "util.logger".init("hostmanager");
 
@@ -56,8 +55,8 @@ end
 prosody_events.add_handler("server-starting", load_enabled_hosts);
 
 local function host_send(stanza)
-       local name, type = stanza.name, stanza.attr.type;
-       if type == "error" or (name == "iq" and type == "result") then
+       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));
@@ -74,7 +73,6 @@ function activate(host, host_config)
                host = host;
                s2sout = {};
                events = events_new();
-               dialback_secret = configmanager.get(host, "dialback_secret") or uuid_gen();
                send = host_send;
                modules = {};
        };