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

Do not send <success/> twice when SCRAM-SHA-1 is used.

Browse Source 
This is a merge bug actually
This commit is contained in:
Evgeniy Khramtsov 2011-09-15 19:24:41 +10:00
parent 8f27a697c0
commit 54acf9bde4
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ejabberd_c2s.erl
View File

@ -936,11 +936,6 @@ wait_for_sasl_response({xmlstreamelement, El}, StateData) ->
{ok, Props, ServerOut} -> {ok, Props, ServerOut} ->
(StateData#state.sockmod):reset_stream( (StateData#state.sockmod):reset_stream(
StateData#state.socket), StateData#state.socket),
send_element(StateData,
{xmlelement, "success",
[{"xmlns", ?NS_SASL}],
[{xmlcdata,
jlib:encode_base64(ServerOut)}]}),
U = xml:get_attr_s(username, Props), U = xml:get_attr_s(username, Props),
AuthModule = xml:get_attr_s(auth_module, Props), AuthModule = xml:get_attr_s(auth_module, Props),
?INFO_MSG("(~w) Accepted authentication for ~s by ~p", ?INFO_MSG("(~w) Accepted authentication for ~s by ~p",
@ -955,7 +950,9 @@ wait_for_sasl_response({xmlstreamelement, El}, StateData) ->
false -> false ->
send_element(StateData, send_element(StateData,
{xmlelement, "success", {xmlelement, "success",
[{"xmlns", ?NS_SASL}], []}), [{"xmlns", ?NS_SASL}],
[{xmlcdata,
jlib:encode_base64(ServerOut)}]}),
fsm_next_state(wait_for_stream, fsm_next_state(wait_for_stream,
StateData#state{ StateData#state{
streamid = new_id(), streamid = new_id(),