aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Donohue <git@PaulSD.com>2013-04-19 15:30:13 -0400
committerPaul Donohue <git@PaulSD.com>2013-04-19 15:30:13 -0400
commitb33a4825827119caf92a167dc872117323910ddf (patch)
tree80f4b94679aaff1ad2e22b5786e45760587f44db /src
parentFix bug when getting room config (diff)
Fix error when generating random binary strings
Diffstat (limited to 'src')
-rw-r--r--src/cyrsasl_anonymous.erl4
-rw-r--r--src/ejabberd_c2s.erl6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/cyrsasl_anonymous.erl b/src/cyrsasl_anonymous.erl
index 3090cfe9d..1daa1c103 100644
--- a/src/cyrsasl_anonymous.erl
+++ b/src/cyrsasl_anonymous.erl
@@ -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}]}
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 1784f022f..dab8fa546 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -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