diff options
| author | Badlop <badlop@process-one.net> | 2009-02-16 15:57:02 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2009-02-16 15:57:02 +0000 |
| commit | 22d87353be0e6849c5a6ae502f28f614a45a7f7b (patch) | |
| tree | 37e88873b8fae630905eeec16c6c400a80322b2a /src | |
| parent | * src/mod_muc/mod_muc_log.erl: Prevent XSS in MUC logs by (diff) | |
* src/mod_muc/mod_muc_room.erl: Owner of a password protected room
must provide the password, like other participants (EJAB-867)
SVN Revision: 1880
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_muc/mod_muc_room.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl index 16de90cbf..34a602585 100644 --- a/src/mod_muc/mod_muc_room.erl +++ b/src/mod_muc/mod_muc_room.erl @@ -1489,7 +1489,7 @@ add_new_user(From, Nick, {xmlelement, _, Attrs, Els} = Packet, StateData) -> From, Err), StateData; {_, _, _, Role} -> - case check_password(Affiliation, Els, StateData) of + case check_password(ServiceAffiliation, Els, StateData) of true -> NewState = add_user_presence( @@ -1546,8 +1546,9 @@ add_new_user(From, Nick, {xmlelement, _, Attrs, Els} = Packet, StateData) -> end. check_password(owner, _Els, _StateData) -> + %% Don't check pass if user is owner in MUC service (access_admin option) true; -check_password(_Affiliation, Els, StateData) -> +check_password(_ServiceAffiliation, Els, StateData) -> case (StateData#state.config)#config.password_protected of false -> true; |