aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-05 04:44:19 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-05 04:44:19 +0000
commitffd26762181bfbbd870e91ae39ac77876f9e5382 (patch)
treeabec6a6a07b805ee133e6b37ff094166848dd95d /core
parent7027c01125981f14eb4d117658036e20e0a8bccc (diff)
downloadprosody-ffd26762181bfbbd870e91ae39ac77876f9e5382.tar.gz
prosody-ffd26762181bfbbd870e91ae39ac77876f9e5382.zip
Fix for s2s with jabberd2 (we weren't routing db:verify's over s2sout_unauthed)
Diffstat (limited to 'core')
-rw-r--r--core/s2smanager.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index df877767..09e163f0 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -56,8 +56,8 @@ function send_to_host(from_host, to_host, data)
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 @@ function send_to_host(from_host, to_host, data)
-- 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());