X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fstanza_router.lua;h=dac098bbccae4af59c7d044d79f027e4303f706a;hb=612cbf433a303ccd49eec61b6709751e37dfb04a;hp=5bf437f9d8f643d7b98c9c3ba1335ba3cdf6f393;hpb=4f17129c1903f50eb8c443b062396e9fee169c83;p=prosody.git

diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 5bf437f9..dac098bb 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -150,11 +150,7 @@ function core_post_stanza(origin, stanza)
 			component_handle_stanza(origin, stanza);
 			return;
 		end
-		if not modules_handle_stanza(h.host, origin, stanza) then
-			if stanza.attr.type ~= "result" and stanza.attr.type ~= "error" then
-				origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
-			end
-		end
+		modules_handle_stanza(h.host, origin, stanza);
 	else
 		core_route_stanza(origin, stanza);
 	end
@@ -173,7 +169,10 @@ function core_route_stanza(origin, stanza)
 		core_post_stanza(origin, stanza);
 	elseif origin.type == "c2s" then
 		-- Remote host
-		if not hosts[from_host].disallow_s2s then
+		if not hosts[from_host] then
+			log("error", "No hosts[from_host] (please report): %s", tostring(stanza));
+		end
+		if (not hosts[from_host]) or (not hosts[from_host].disallow_s2s) then
 			local xmlns = stanza.attr.xmlns;
 			--stanza.attr.xmlns = "jabber:server";
 			stanza.attr.xmlns = nil;