Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

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

Browse Source 
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 39f71ab2ab
commit 240e37c387
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2009-04-22 Badlop <badlop@process-one.net> 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 * src/mod_shared_roster.erl: Support in API to add 'all' as member
of a group (thanks to Martin Langhoff)(EJAB-916) of a group (thanks to Martin Langhoff)(EJAB-916)

14
src/ejabberd_c2s.erl
View File

@ -407,9 +407,9 @@ wait_for_auth({xmlstreamelement, El}, StateData) ->
StateData#state.streamid, D) of StateData#state.streamid, D) of
{true, AuthModule} -> {true, AuthModule} ->
?INFO_MSG( ?INFO_MSG(
"(~w) Accepted legacy authentication for ~s", "(~w) Accepted legacy authentication for ~s by ~s",
[StateData#state.socket, [StateData#state.socket,
exmpp_jid:jid_to_binary(JID)]), exmpp_jid:jid_to_binary(JID), AuthModule]),
SID = {now(), self()}, SID = {now(), self()},
Conn = get_conn_type(StateData), Conn = get_conn_type(StateData),
Info = [{ip, StateData#state.ip}, {conn, Conn}, Info = [{ip, StateData#state.ip}, {conn, Conn},
@ -513,12 +513,14 @@ wait_for_feature_request({xmlstreamelement, #xmlel{ns = NS, name = Name} = El},
StateData#state.socket), StateData#state.socket),
send_element(StateData, exmpp_server_sasl:success()), send_element(StateData, exmpp_server_sasl:success()),
U = proplists:get_value(username, Props), U = proplists:get_value(username, Props),
?INFO_MSG("(~w) Accepted authentication for ~s", AuthModule = proplists:get_value(auth_module, Props),
[StateData#state.socket, U]), ?INFO_MSG("(~w) Accepted authentication for ~s by ~s",
[StateData#state.socket, U, AuthModule]),
fsm_next_state(wait_for_stream, fsm_next_state(wait_for_stream,
StateData#state{ StateData#state{
streamid = new_id(), streamid = new_id(),
authenticated = true, authenticated = true,
auth_module = AuthModule,
user = list_to_binary(U) }); user = list_to_binary(U) });
{continue, ServerOut, NewSASLState} -> {continue, ServerOut, NewSASLState} ->
send_element(StateData, send_element(StateData,
@ -628,8 +630,8 @@ wait_for_sasl_response({xmlstreamelement, #xmlel{ns = NS, name = Name} = El},
send_element(StateData, exmpp_server_sasl:success()), send_element(StateData, exmpp_server_sasl:success()),
U = proplists:get_value(username, Props), U = proplists:get_value(username, Props),
AuthModule = proplists:get_value(auth_module, Props), AuthModule = proplists:get_value(auth_module, Props),
?INFO_MSG("(~w) Accepted authentication for ~s", ?INFO_MSG("(~w) Accepted authentication for ~s by ~s",
[StateData#state.socket, U]), [StateData#state.socket, U, AuthModule]),
fsm_next_state(wait_for_stream, fsm_next_state(wait_for_stream,
StateData#state{ StateData#state{
streamid = new_id(), streamid = new_id(),