Merge with 0.6

Wed, 25 Nov 2009 03:30:41 +0000

author
Matthew Wild <mwild1@gmail.com>
date
Wed, 25 Nov 2009 03:30:41 +0000
changeset 2166
fb01f0906564
parent 2164
339a96689dcb (current diff)
parent 2165
529af807ba1a (diff)
child 2170
2abca9cc78b1

Merge with 0.6

core/s2smanager.lua file | annotate | diff | comparison | revisions
--- a/core/s2smanager.lua	Tue Nov 24 20:35:18 2009 +0000
+++ b/core/s2smanager.lua	Wed Nov 25 03:30:41 2009 +0000
@@ -79,6 +79,10 @@
 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

mercurial