Merge with Zash

diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index 5cb59fef32cd6f0140236c9642fda0d53cbc5ce3..e578c4129e55dd688f6d6851a87fc658ad15b729 100644 (file)
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -155,12 +155,14 @@ end, 100);
 
 module:hook_stanza(xmlns_stream, "features", function (origin, stanza)
        if not origin.external_auth or origin.external_auth == "failed" then
+               module:log("debug", "Initiating dialback...");
                initiate_dialback(origin);
                return true;
        end
 end, 100);
 
-module:hook("s2s-no-stream-features", function (event)
+module:hook("s2s-authenticate-legacy", function (event)
+       module:log("debug", "Initiating dialback...");
        initiate_dialback(event.origin);
        return true;
 end, 100);

diff --git a/plugins/s2s/mod_s2s.lua b/plugins/s2s/mod_s2s.lua
index 9ab2ee0a02b5f9a6ecf9ba21557abc5e27a5dc3c..407a7e04125bba573da14808af7022d950d66165 100644 (file)
--- a/plugins/s2s/mod_s2s.lua
+++ b/plugins/s2s/mod_s2s.lua
@@ -232,8 +232,7 @@ function stream_callbacks.streamopened(session, attr)
                -- If server is pre-1.0, don't wait for features, just do dialback
                if session.version < 1.0 then
                        if not session.dialback_verifying then
-                               log("debug", "Initiating dialback...");
-                               hosts[session.from_host].events.fire_event("s2s-no-stream-features", { origin = session });
+                               hosts[session.from_host].events.fire_event("s2s-authenticate-legacy", { origin = session });
                        else
                                s2s_mark_connected(session);
                        end