Merge r1880 from trunk:

* src/mod_muc/mod_muc_room.erl: Owner of a password protected room
must provide the password, like other participants (EJAB-867)

SVN Revision: 1906

diff --git a/ChangeLog b/ChangeLog
index b64bd1f6d6e50f755a318d7f65feb12a5bd6d582..907eda0351ce326777960df3d906a4bb9435af0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-02-21  Badlop  <badlop@process-one.net>
 
+       * src/mod_muc/mod_muc_room.erl: Owner of a password protected room
+       must provide the password, like other participants (EJAB-867)
+
        * src/mod_muc/mod_muc_log.erl: Prevent XSS in MUC logs by
        linkifying only a few known protocols (EJAB-850)
 

diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index 458edaa4fd733852d230e06312c5bb9fae7b9f47..b32ed4c08e5a4258f176243f1f9c9c55cd17a6c8 100644 (file)
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -1461,7 +1461,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(
@@ -1518,8 +1518,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;