Diff

core/s2smanager.lua @ 558:ab3960421356

Fix for s2s with jabberd2 (we weren't routing db:verify's over s2sout_unauthed)
author Matthew Wild <mwild1@gmail.com>
date Fri, 05 Dec 2008 04:44:19 +0000
parent 544:efde848869c5
child 559:fa4a51fe6442
line wrap: on
line diff
--- a/core/s2smanager.lua	Fri Dec 05 02:02:57 2008 +0000
+++ b/core/s2smanager.lua	Fri Dec 05 04:44:19 2008 +0000
@@ -56,8 +56,8 @@
 	local host = hosts[from_host].s2sout[to_host];
 	if host then
 		-- We have a connection to this host already
-		if host.type == "s2sout_unauthed" and ((not data.xmlns) or data.xmlns == "jabber:client" or data.xmlns == "jabber:server") then
-			(host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host..", authing it now...");
+		if host.type == "s2sout_unauthed" and (data.xmlns == "jabber:client" or data.xmlns == "jabber:server") then
+			(host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host);
 			if not host.notopen and not host.dialback_key then
 				host.log("debug", "dialback had not been initiated");
 				initiate_dialback(host);
@@ -66,6 +66,7 @@
 			-- Queue stanza until we are able to send it
 			if host.sendq then t_insert(host.sendq, data);
 			else host.sendq = { data }; end
+			host.log("debug", "stanza queued");
 		elseif host.type == "local" or host.type == "component" then
 			log("error", "Trying to send a stanza to ourselves??")
 			log("error", "Traceback: %s", get_traceback());