# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1269270335 0
# Node ID 8ce6b680975a49da3ddd69c4cd4572efa2ce7918
# Parent  c29ecf0cadff623b61ea2300ccfc1d05f0bd3d46# Parent  79ca9f686aaf1b4aaf008288de91a7587ec24085
Merge 0.7->trunk

diff -r c29ecf0cadff -r 8ce6b680975a core/stanza_router.lua
--- a/core/stanza_router.lua	Mon Mar 22 14:59:03 2010 +0000
+++ b/core/stanza_router.lua	Mon Mar 22 15:05:35 2010 +0000
@@ -36,12 +36,14 @@
 		end
 	end
 
-	if origin.type == "c2s" then
+	if origin.type == "c2s" and stanza.attr.xmlns == "jabber:client" then
 		if not origin.full_jid
 			and not(stanza.name == "iq" and stanza.attr.type == "set" and stanza.tags[1] and stanza.tags[1].name == "bind"
 					and stanza.tags[1].attr.xmlns == "urn:ietf:params:xml:ns:xmpp-bind") then
 			-- authenticated client isn't bound and current stanza is not a bind request
-			origin.send(st.error_reply(stanza, "auth", "not-authorized")); -- FIXME maybe allow stanzas to account or server
+			if stanza.attr.type ~= "result" and stanza.attr.type ~= "error" then
+				origin.send(st.error_reply(stanza, "auth", "not-authorized")); -- FIXME maybe allow stanzas to account or server
+			end
 			return;
 		end