mod_storage_sql: Add method for listing stores

[prosody.git] / plugins / mod_component.lua

diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index 09b0d2b3d190ba505e57795416802c179c785735..751de59bf17120b4d3f2627f3a7a34abb4566fb5 100644 (file)
--- a/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@ -18,6 +18,8 @@ local jid_split = require "util.jid".split;
 local new_xmpp_stream = require "util.xmppstream".new;
 local uuid_gen = require "util.uuid".generate;
 
+local core_process_stanza = prosody.core_process_stanza;
+
 
 local log = module._log;
 
@@ -43,7 +45,7 @@ function module.add_host(module)
        local function handle_component_auth(event)
                local session, stanza = event.origin, event.stanza;
                
-               if session.type ~= "component" then return; end
+               if session.type ~= "component_unauthed" then return; end
        
                if (not session.host) or #stanza.tags > 0 then
                        (session.log or log)("warn", "Invalid component handshake for host: %s", session.host);
@@ -124,7 +126,7 @@ local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
 
 function stream_callbacks.error(session, error, data, data2)
        if session.destroyed then return; end
-       module:log("warn", "Error processing component stream: "..tostring(error));
+       module:log("warn", "Error processing component stream: %s", tostring(error));
        if error == "no-stream" then
                session:close("invalid-namespace");
        elseif error == "parse-error" then
@@ -169,8 +171,6 @@ function stream_callbacks.streamclosed(session)
        session:close();
 end
 
-local core_process_stanza = core_process_stanza;
-
 function stream_callbacks.handlestanza(session, stanza)
        -- Namespaces are icky.
        if not stanza.attr.xmlns and stanza.name == "handshake" then