Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Merge pull request #62 from PaulSD/master 

Fix errors when generating random binary strings
This commit is contained in:
badlop 2013-04-25 03:48:55 -07:00
parent d38ccbea6b b33a482582
commit 54667511f6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cyrsasl_anonymous.erl
View File

@ -43,7 +43,9 @@ mech_new(Host, _GetPassword, _CheckPassword, _CheckPasswordDigest) ->
{ok, #state{server = Host}}.
mech_step(#state{server = Server}, _ClientIn) ->
User = iolist_to_binary([randoms:get_string() | tuple_to_list(now())]),
User = iolist_to_binary([randoms:get_string()
| [jlib:integer_to_binary(X)
|| X <- tuple_to_list(now())]]),
case ejabberd_auth:is_user_exists(User, Server) of
true -> {error, <<"not-authorized">>};
false -> {ok, [{username, User}, {auth_module, ejabberd_auth_anonymous}]}

6
src/ejabberd_c2s.erl
View File

@ -897,7 +897,8 @@ resource_conflict_action(U, S, R) ->
closenew -> closenew;
setresource ->
Rnew = iolist_to_binary([randoms:get_string()
| tuple_to_list(now())]),
| [jlib:integer_to_binary(X)
|| X <- tuple_to_list(now())]]),
{accept_resource, Rnew}
end.
@ -912,7 +913,8 @@ wait_for_bind({xmlstreamelement, El}, StateData) ->
error -> error;
<<"">> ->
iolist_to_binary([randoms:get_string()
| tuple_to_list(now())]);
| [jlib:integer_to_binary(X)
|| X <- tuple_to_list(now())]]);
Resource -> Resource
end,
case R of