From ea62092d6e8264beb31c656f6ccc0c1556f26cfc Mon Sep 17 00:00:00 2001 From: Pablo Polvorin Date: Wed, 18 Feb 2009 13:48:06 +0000 Subject: [PATCH] src/ejabberd_auth.erl: Fix: for legacy authentication, the Digest parameters could be 'undefined'. src/mod_muc/mod_muc_room.erl: Typo. src/ejabberd_c2s.erl: Remove comment for an already done TODO. SVN Revision: 1885 --- ChangeLog | 9 +++++++++ src/ejabberd_auth.erl | 2 +- src/ejabberd_c2s.erl | 1 - src/mod_muc/mod_muc_room.erl | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9a7a1db0..b0f23021e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-02-18 Pablo Polvorin + + * src/ejabberd_auth.erl: Fix: for legacy authentication, the Digest + parameters could be 'undefined'. + + * src/mod_muc/mod_muc_room.erl: Typo. + + * src/ejabberd_c2s.erl: Remove comment for an already done TODO. + 2009-02-13 Christophe Romain * src/ejabberd_auth.erl: prevent from calling diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl index 8e267ec37..3e5152be5 100644 --- a/src/ejabberd_auth.erl +++ b/src/ejabberd_auth.erl @@ -145,7 +145,7 @@ check_password_with_authmodule(User, Server, Password) check_password_with_authmodule(User, Server, Password, StreamID, Digest) when is_list(User), is_list(Server), is_list(Password), - is_list(StreamID), is_list(Digest) -> + is_list(StreamID), (is_list(Digest) orelse Digest == 'undefined')-> Res = lists:dropwhile( fun(M) -> not apply(M, check_password, diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index e1d70770d..5377028ea 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -826,7 +826,6 @@ session_established2(El, StateData) -> User = StateData#state.user, Server = StateData#state.server, - % TODO: check 'from' attribute in stanza FromJID = StateData#state.jid, To = exmpp_stanza:get_recipient(El), ToJID = case To of diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl index 95400ed78..bac145b9b 100644 --- a/src/mod_muc/mod_muc_room.erl +++ b/src/mod_muc/mod_muc_room.erl @@ -1323,7 +1323,7 @@ prepare_room_queue(StateData) -> {{value, {message, From}}, _RoomQueue} -> Activity = get_user_activity(From, StateData), Packet = Activity#activity.message, - Size = erlang:iolist_size(exmpp_xml:documenent_to_iolist(Packet)), + Size = erlang:iolist_size(exmpp_xml:document_to_iolist(Packet)), {RoomShaper, RoomShaperInterval} = shaper:update(StateData#state.room_shaper, Size), erlang:send_after(