aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-22 15:05:35 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-22 15:05:35 +0000
commit80139e91aad31e2809038e7de13acb0e93e29635 (patch)
treea2ae2f347c2dea808a158d622cff4d51529612ae /core
parent9613171fcbd245d285a95acc6cf7e3134469e5c5 (diff)
parenta5c2d24d44c1e33f04bb42e59f5fb66cdf8a31ba (diff)
downloadprosody-80139e91aad31e2809038e7de13acb0e93e29635.tar.gz
prosody-80139e91aad31e2809038e7de13acb0e93e29635.zip
Merge 0.7->trunk
Diffstat (limited to 'core')
-rw-r--r--core/stanza_router.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 72ddebd1..c47cdd45 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -36,12 +36,14 @@ function core_process_stanza(origin, stanza)
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