aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-24 10:44:37 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-24 10:44:37 +0100
commit3cb0187ad03c1d6414254bcce1f4d66a01b6bb5c (patch)
tree8cb2893d9bf6db4144ef06dea382a2a5de1228af
parent49d71b5ec14b4021448d9dba3c3aeab028c0091f (diff)
downloadprosody-3cb0187ad03c1d6414254bcce1f4d66a01b6bb5c.tar.gz
prosody-3cb0187ad03c1d6414254bcce1f4d66a01b6bb5c.zip
mod_muc: Fix a couple of cases of 'forbidden' stanza error being sent with type 'cancel' - fixes #303
-rw-r--r--plugins/muc/muc.lib.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 5178cb1e..a40dc05f 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -856,7 +856,7 @@ function room_mt:handle_to_room(origin, stanza) -- presence changes and groupcha
if not occupant then -- not in room
origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
elseif occupant.role == "visitor" then
- origin.send(st.error_reply(stanza, "cancel", "forbidden"));
+ origin.send(st.error_reply(stanza, "auth", "forbidden"));
else
local from = stanza.attr.from;
stanza.attr.from = current_nick;
@@ -867,7 +867,7 @@ function room_mt:handle_to_room(origin, stanza) -- presence changes and groupcha
self:set_subject(current_nick, subject); -- TODO use broadcast_message_stanza
else
stanza.attr.from = from;
- origin.send(st.error_reply(stanza, "cancel", "forbidden"));
+ origin.send(st.error_reply(stanza, "auth", "forbidden"));
end
else
self:broadcast_message(stanza, self:get_historylength() > 0);