25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-20 16:15:59 +01:00

* src/ejabberd_c2s.erl: Fix for SASL Anonymous connections not

stored or purged (thanks to Andy Skelton)(EJAB-912)

SVN Revision: 2032
This commit is contained in:
Badlop 2009-04-22 11:02:03 +00:00
parent d7223ea6ef
commit ca8eeaac57
2 changed files with 11 additions and 6 deletions

View File

@ -1,5 +1,8 @@
2009-04-22 Badlop <badlop@process-one.net>
* src/ejabberd_c2s.erl: Fix for SASL Anonymous connections not
stored or purged (thanks to Andy Skelton)(EJAB-912)
* src/mod_shared_roster.erl: Support in API to add 'all' as member
of a group (thanks to Martin Langhoff)(EJAB-916)

View File

@ -449,9 +449,9 @@ wait_for_auth({xmlstreamelement, El}, StateData) ->
StateData#state.streamid, D) of
{true, AuthModule} ->
?INFO_MSG(
"(~w) Accepted legacy authentication for ~s",
"(~w) Accepted legacy authentication for ~s by ~p",
[StateData#state.socket,
jlib:jid_to_string(JID)]),
jlib:jid_to_string(JID), AuthModule]),
SID = {now(), self()},
Conn = get_conn_type(StateData),
Info = [{ip, StateData#state.ip}, {conn, Conn},
@ -558,12 +558,14 @@ wait_for_feature_request({xmlstreamelement, El}, StateData) ->
{xmlelement, "success",
[{"xmlns", ?NS_SASL}], []}),
U = xml:get_attr_s(username, Props),
?INFO_MSG("(~w) Accepted authentication for ~s",
[StateData#state.socket, U]),
AuthModule = xml:get_attr_s(auth_module, Props),
?INFO_MSG("(~w) Accepted authentication for ~s by ~p",
[StateData#state.socket, U, AuthModule]),
fsm_next_state(wait_for_stream,
StateData#state{
streamid = new_id(),
authenticated = true,
auth_module = AuthModule,
user = U });
{continue, ServerOut, NewSASLState} ->
send_element(StateData,
@ -691,8 +693,8 @@ wait_for_sasl_response({xmlstreamelement, El}, StateData) ->
[{"xmlns", ?NS_SASL}], []}),
U = xml:get_attr_s(username, Props),
AuthModule = xml:get_attr_s(auth_module, Props),
?INFO_MSG("(~w) Accepted authentication for ~s",
[StateData#state.socket, U]),
?INFO_MSG("(~w) Accepted authentication for ~s by ~p",
[StateData#state.socket, U, AuthModule]),
fsm_next_state(wait_for_stream,
StateData#state{
streamid = new_id(),