# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1330799252 0
# Node ID 3e77028916494eb6f428b08cb6d254a37080e617
# Parent  a8901f59bc5363cffa9574b67ea698b9f385acbb# Parent  93a84314c296eeed26615ddbf9304a0477d5a136
Merge with Zash

diff -r a8901f59bc53 -r 3e7702891649 plugins/mod_dialback.lua
--- a/plugins/mod_dialback.lua	Sat Mar 03 01:12:16 2012 +0000
+++ b/plugins/mod_dialback.lua	Sat Mar 03 18:27:32 2012 +0000
@@ -155,12 +155,14 @@
 
 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 -r a8901f59bc53 -r 3e7702891649 plugins/s2s/mod_s2s.lua
--- a/plugins/s2s/mod_s2s.lua	Sat Mar 03 01:12:16 2012 +0000
+++ b/plugins/s2s/mod_s2s.lua	Sat Mar 03 18:27:32 2012 +0000
@@ -232,8 +232,7 @@
 		-- 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