mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-22 16:20:52 +01:00
* src/ejabberd_c2s.erl: Returned stream restarting
SVN Revision: 116
This commit is contained in:
parent
1a8ed857dc
commit
26fbd7f521
@ -1,3 +1,7 @@
|
|||||||
|
2003-06-20 Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
|
||||||
|
* src/ejabberd_c2s.erl: Returned stream restarting
|
||||||
|
|
||||||
2003-06-10 Alexey Shchepin <alexey@sevcom.net>
|
2003-06-10 Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
|
||||||
* src/ejabberd_c2s.erl: Removed stream restarting
|
* src/ejabberd_c2s.erl: Removed stream restarting
|
||||||
|
@ -258,13 +258,13 @@ wait_for_sasl_auth({xmlstreamelement, El}, StateData) ->
|
|||||||
Mech,
|
Mech,
|
||||||
ClientIn) of
|
ClientIn) of
|
||||||
{ok, Props} ->
|
{ok, Props} ->
|
||||||
%StateData#state.receiver ! reset_stream,
|
StateData#state.receiver ! reset_stream,
|
||||||
send_element(StateData,
|
send_element(StateData,
|
||||||
{xmlelement, "success",
|
{xmlelement, "success",
|
||||||
[{"xmlns", ?NS_SASL}], []}),
|
[{"xmlns", ?NS_SASL}], []}),
|
||||||
{U, _, R} = jlib:string_to_jid(
|
{U, _, R} = jlib:string_to_jid(
|
||||||
xml:get_attr_s(authzid, Props)),
|
xml:get_attr_s(authzid, Props)),
|
||||||
{next_state, wait_for_session,
|
{next_state, wait_for_stream,
|
||||||
StateData#state{authentificated = true,
|
StateData#state{authentificated = true,
|
||||||
user = U,
|
user = U,
|
||||||
resource = R
|
resource = R
|
||||||
@ -321,13 +321,13 @@ wait_for_sasl_response({xmlstreamelement, El}, StateData) ->
|
|||||||
case cyrsasl:server_step(StateData#state.sasl_state,
|
case cyrsasl:server_step(StateData#state.sasl_state,
|
||||||
ClientIn) of
|
ClientIn) of
|
||||||
{ok, Props} ->
|
{ok, Props} ->
|
||||||
%StateData#state.receiver ! reset_stream,
|
StateData#state.receiver ! reset_stream,
|
||||||
send_element(StateData,
|
send_element(StateData,
|
||||||
{xmlelement, "success",
|
{xmlelement, "success",
|
||||||
[{"xmlns", ?NS_SASL}], []}),
|
[{"xmlns", ?NS_SASL}], []}),
|
||||||
{U, _, R} = jlib:string_to_jid(
|
{U, _, R} = jlib:string_to_jid(
|
||||||
xml:get_attr_s(authzid, Props)),
|
xml:get_attr_s(authzid, Props)),
|
||||||
{next_state, wait_for_session,
|
{next_state, wait_for_stream,
|
||||||
StateData#state{authentificated = true,
|
StateData#state{authentificated = true,
|
||||||
user = U,
|
user = U,
|
||||||
resource = R
|
resource = R
|
||||||
|
Loading…
Reference in New Issue
Block a user