aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-03-10 11:25:05 +0000
committerMatthew Wild <mwild1@gmail.com>2013-03-10 11:25:05 +0000
commitf936068a625d3e34d3e72c79e13b81fba34b28ab (patch)
tree479c845b81a7d47465c3223177a7119dbe3dd7ba
parentcd8da4a60d5b3924953247f714a9df495b289093 (diff)
downloadprosody-f936068a625d3e34d3e72c79e13b81fba34b28ab.tar.gz
prosody-f936068a625d3e34d3e72c79e13b81fba34b28ab.zip
mod_s2s, mod_dialback: Rename s2s-authenticate-legacy event to s2sout-authenticate-legacy for clarity. Also, hello!
-rw-r--r--plugins/mod_dialback.lua2
-rw-r--r--plugins/mod_s2s/mod_s2s.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index b2f84603..34d8a2fb 100644
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -170,7 +170,7 @@ module:hook_stanza(xmlns_stream, "features", function (origin, stanza)
end
end, 100);
-module:hook("s2s-authenticate-legacy", function (event)
+module:hook("s2sout-authenticate-legacy", function (event)
module:log("debug", "Initiating dialback...");
initiate_dialback(event.origin);
return true;
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 15c89ced..1b0ae982 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -287,7 +287,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
- hosts[session.from_host].events.fire_event("s2s-authenticate-legacy", { origin = session });
+ hosts[session.from_host].events.fire_event("s2sout-authenticate-legacy", { origin = session });
else
s2s_mark_connected(session);
end