diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-07-24 10:44:37 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-07-24 10:44:37 +0100 |
commit | ce33d9c59d49b9b290a8c2c142861dc35779c1b1 (patch) | |
tree | 8cb2893d9bf6db4144ef06dea382a2a5de1228af /plugins/muc/muc.lib.lua | |
parent | 679474405392564918f652f8abb78b878f51036f (diff) | |
download | prosody-ce33d9c59d49b9b290a8c2c142861dc35779c1b1.tar.gz prosody-ce33d9c59d49b9b290a8c2c142861dc35779c1b1.zip |
mod_muc: Fix a couple of cases of 'forbidden' stanza error being sent with type 'cancel' - fixes #303
Diffstat (limited to 'plugins/muc/muc.lib.lua')
-rw-r--r-- | plugins/muc/muc.lib.lua | 4 |
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); |