# HG changeset patch # User Matthew Wild # Date 1228452259 0 # Node ID ab3960421356ff8407117415d0e817d158f97ee4 # Parent c9b3ffb08fe3a0c8cb674a5a93dca61e1902610c Fix for s2s with jabberd2 (we weren't routing db:verify's over s2sout_unauthed) diff -r c9b3ffb08fe3 -r ab3960421356 core/s2smanager.lua --- 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());