aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-11-25 03:30:41 +0000
committerMatthew Wild <mwild1@gmail.com>2009-11-25 03:30:41 +0000
commitfc220d6217b14bb08eb59dd50b5e8319f63a3290 (patch)
tree13b8d9deb5a736dd276140f09ca7487b97b9eda2
parent23a0480d9b9bed9d4e115cecf64d7e6ab377c05c (diff)
parentc4742ed7810b3e10bfc6bdb55a11c31b3faf5426 (diff)
downloadprosody-fc220d6217b14bb08eb59dd50b5e8319f63a3290.tar.gz
prosody-fc220d6217b14bb08eb59dd50b5e8319f63a3290.zip
Merge with 0.6
-rw-r--r--core/s2smanager.lua4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index e1f70693..666022d1 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -79,6 +79,10 @@ local function bounce_sendq(session)
end
function send_to_host(from_host, to_host, data)
+ if not hosts[from_host] then
+ log("warn", "Attempt to send stanza from %s - a host we don't serve", from_host);
+ return false;
+ end
local host = hosts[from_host].s2sout[to_host];
if host then
-- We have a connection to this host already