summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/ejabberd_c2s.erl8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 71b8021e..cc62ec6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-10 Alexey Shchepin <alexey@sevcom.net>
+
+ * src/ejabberd_c2s.erl: Removed stream restarting
+
2003-06-07 Alexey Shchepin <alexey@sevcom.net>
* src/ejabberd_c2s.erl: SASL support updated to xmpp-core-13
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index fb6bec27..6fd152ae 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -258,13 +258,13 @@ wait_for_sasl_auth({xmlstreamelement, El}, StateData) ->
Mech,
ClientIn) of
{ok, Props} ->
- StateData#state.receiver ! reset_stream,
+ %StateData#state.receiver ! reset_stream,
send_element(StateData,
{xmlelement, "success",
[{"xmlns", ?NS_SASL}], []}),
{U, _, R} = jlib:string_to_jid(
xml:get_attr_s(authzid, Props)),
- {next_state, wait_for_stream,
+ {next_state, wait_for_session,
StateData#state{authentificated = true,
user = U,
resource = R
@@ -321,13 +321,13 @@ wait_for_sasl_response({xmlstreamelement, El}, StateData) ->
case cyrsasl:server_step(StateData#state.sasl_state,
ClientIn) of
{ok, Props} ->
- StateData#state.receiver ! reset_stream,
+ %StateData#state.receiver ! reset_stream,
send_element(StateData,
{xmlelement, "success",
[{"xmlns", ?NS_SASL}], []}),
{U, _, R} = jlib:string_to_jid(
xml:get_attr_s(authzid, Props)),
- {next_state, wait_for_stream,
+ {next_state, wait_for_session,
StateData#state{authentificated = true,
user = U,
resource = R