# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1226630000 0
# Node ID 762274c9804002ab369c40c210478b853efa6737
# Parent  c14ddd0912a2e376a952b58395a8d60349e300ea
I knew it ;) Fix sending error replies over s2s (though we shouldn't be error'ing on stream:features anyway)

diff -r c14ddd0912a2 -r 762274c98040 core/s2smanager.lua
--- a/core/s2smanager.lua	Fri Nov 14 02:23:43 2008 +0000
+++ b/core/s2smanager.lua	Fri Nov 14 02:33:20 2008 +0000
@@ -48,7 +48,7 @@
 		elseif host.type == "local" or host.type == "component" then
 			log("error", "Trying to send a stanza to ourselves??")
 			log("error", "Traceback: %s", get_traceback());
-			log("error", "Stanza: %s", stanza);
+			log("error", "Stanza: %s", data);
 		else
 			(host.log or log)("debug", "going to send stanza to "..to_host.." from "..from_host);
 			-- FIXME
diff -r c14ddd0912a2 -r 762274c98040 core/stanza_router.lua
--- a/core/stanza_router.lua	Fri Nov 14 02:23:43 2008 +0000
+++ b/core/stanza_router.lua	Fri Nov 14 02:33:20 2008 +0000
@@ -182,7 +182,8 @@
 		end -- TODO handle other stanzas
 	else
 		log("warn", "Unhandled origin: %s", origin.type);
-		origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
+		-- s2s stanzas can get here
+		(origin.sends2s or origin.send)(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
 	end
 end