From 54acf9bde4a9d7f9d5ab75d42409da8b5f2a0c91 Mon Sep 17 00:00:00 2001
From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Thu, 15 Sep 2011 19:24:41 +1000
Subject: [PATCH] Do not send <success/> twice when SCRAM-SHA-1 is used. This
 is a merge bug actually

---
 src/ejabberd_c2s.erl | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

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