diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-03-03 18:27:32 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-03-03 18:27:32 +0000 |
| commit | 58e21b71744734e3e69fcaa9043f9e195889d706 (patch) | |
| tree | 65abf0a8b4428276a7be51803f02f176b368530a | |
| parent | 66cfee9b84e3d6c947e238574006fc3fbf586915 (diff) | |
| parent | 58900081f68e8db61675febc4f9c4078e44d384a (diff) | |
| download | prosody-58e21b71744734e3e69fcaa9043f9e195889d706.tar.gz prosody-58e21b71744734e3e69fcaa9043f9e195889d706.zip | |
Merge with Zash
| -rw-r--r-- | plugins/mod_dialback.lua | 4 | ||||
| -rw-r--r-- | plugins/s2s/mod_s2s.lua | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua index 5cb59fef..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-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 9ab2ee0a..407a7e04 100644 --- 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 |