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

exmpp_server_sasl:next_step/1 returns the mechanism as list() again, so

Browse Source 
the call to binary_to_list/1 isn't necessary anymore.

PR:		EJABP-1

SVN Revision: 1853
This commit is contained in:
Jean-Sébastien Pédron 2009-01-23 14:06:48 +00:00
parent b5c8b99272
commit 69a2194efe
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -4,6 +4,10 @@
src/cyrsasl_digest.erl: Document every functions to clarify the types src/cyrsasl_digest.erl: Document every functions to clarify the types
to give and returned. to give and returned.
* src/ejabberd_c2s.erl: exmpp_server_sasl:next_step/1 returns the
mechanism as list() again, so the call to binary_to_list/1 isn't
necessary anymore.
2009-01-23 Badlop <badlop@process-one.net> 2009-01-23 Badlop <badlop@process-one.net>
* src/odbc/mysql.sql: Fix complain about comment syntax * src/odbc/mysql.sql: Fix complain about comment syntax

2
src/ejabberd_c2s.erl
View File

@ -506,7 +506,7 @@ wait_for_feature_request({xmlstreamelement, #xmlel{ns = NS, name = Name} = El},
{?NS_SASL, 'auth'} when not ((SockMod == gen_tcp) and TLSRequired) -> {?NS_SASL, 'auth'} when not ((SockMod == gen_tcp) and TLSRequired) ->
{auth, Mech, ClientIn} = exmpp_server_sasl:next_step(El), {auth, Mech, ClientIn} = exmpp_server_sasl:next_step(El),
case cyrsasl:server_start(StateData#state.sasl_state, case cyrsasl:server_start(StateData#state.sasl_state,
binary_to_list(Mech), Mech,
ClientIn) of ClientIn) of
{ok, Props} -> {ok, Props} ->
(StateData#state.sockmod):reset_stream( (StateData#state.sockmod):reset_stream(