aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-07 10:59:37 +0100
committerKim Alvefur <zash@zash.se>2016-03-07 10:59:37 +0100
commit02381f2835577bf932c300d22889aa23302b9cf9 (patch)
treec4b30469da9e6c8e9e75d0b8d816049ab5e19185 /plugins/muc
parent41d0ddcf70e0f04dec8f4fc7e7485b250eeb7d9d (diff)
downloadprosody-02381f2835577bf932c300d22889aa23302b9cf9.tar.gz
prosody-02381f2835577bf932c300d22889aa23302b9cf9.zip
MUC: Don't reply to error stanzas with more error stanzas (thanks woffs)
Diffstat (limited to 'plugins/muc')
-rw-r--r--plugins/muc/mod_muc.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 4f5831a6..74909d9b 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -255,9 +255,11 @@ for event_name, method in pairs {
-- Watch presence to create rooms
if stanza.attr.type == nil and stanza.name == "presence" then
room = muclib.new_room(room_jid);
- else
+ elseif stanza.attr.type ~= "error" then
origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
return true;
+ else
+ return;
end
end
return room[method](room, origin, stanza);