diff options
| author | badlop <badlop@ono.com> | 2013-04-25 03:48:55 -0700 |
|---|---|---|
| committer | badlop <badlop@ono.com> | 2013-04-25 03:48:55 -0700 |
| commit | 54667511f60651900753a0c0f141dc6139c27f64 (patch) | |
| tree | e378ef9864c4a7b17b31c4b9d7bb6db448de4a4e /src/ejabberd_c2s.erl | |
| parent | access_createnode acl also applies to auto created nodes (thanks to Matthias ... (diff) | |
| parent | Fix error when generating random binary strings (diff) | |
Merge pull request #62 from PaulSD/master
Fix errors when generating random binary strings
Diffstat (limited to 'src/ejabberd_c2s.erl')
| -rw-r--r-- | src/ejabberd_c2s.erl | 6 |
1 files changed, 4 insertions, 2 deletions
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 |