Changeset

4588:3e7702891649

Merge with Zash
author Matthew Wild <mwild1@gmail.com>
date Sat, 03 Mar 2012 18:27:32 +0000 (2012-03-03)
parents 4585:a8901f59bc53 (current diff) 4587:93a84314c296 (diff)
children 4589:8553d822f417 4590:883611842d3a
files
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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