aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-03-03 16:45:34 +0100
committerKim Alvefur <zash@zash.se>2012-03-03 16:45:34 +0100
commit58900081f68e8db61675febc4f9c4078e44d384a (patch)
treea239c1f0f2e1c4174ec5c3da516abad6321a0fc1
parentd0424f6f4e316f435f8e4db6f4906964c7d8f31f (diff)
downloadprosody-58900081f68e8db61675febc4f9c4078e44d384a.tar.gz
prosody-58900081f68e8db61675febc4f9c4078e44d384a.zip
mod_dialback, mod_s2s: Log initiation of dialback in mod_dialback
-rw-r--r--plugins/mod_dialback.lua2
-rw-r--r--plugins/s2s/mod_s2s.lua1
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index 2c2dc795..e578c412 100644
--- 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-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 bebf1962..407a7e04 100644
--- a/plugins/s2s/mod_s2s.lua
+++ b/plugins/s2s/mod_s2s.lua
@@ -232,7 +232,6 @@ 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-authenticate-legacy", { origin = session });
else
s2s_mark_connected(session);