From a4e320c263188d6d9eb24b23bf04b18a8f48177c Mon Sep 17 00:00:00 2001
From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Fri, 26 Oct 2012 20:02:25 +1000
Subject: [PATCH] Get rid of dreaded tuple_to_list(now())

---
 src/cyrsasl_anonymous.erl      | 2 +-
 src/ejabberd_c2s.erl           | 7 ++-----
 src/web/ejabberd_bosh.erl      | 3 +--
 src/web/ejabberd_http_bind.erl | 3 +--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/cyrsasl_anonymous.erl b/src/cyrsasl_anonymous.erl
index 93f9e0a75..9f1855f28 100644
--- a/src/cyrsasl_anonymous.erl
+++ b/src/cyrsasl_anonymous.erl
@@ -43,7 +43,7 @@ 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 = randoms:get_string(),
     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 c7be11e63..221dc1744 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1125,8 +1125,7 @@ resource_conflict_action(U, S, R) ->
       acceptnew -> {accept_resource, R};
       closenew -> closenew;
       setresource ->
-	  Rnew = iolist_to_binary([randoms:get_string()
-                                   | tuple_to_list(now())]),
+	  Rnew = randoms:get_string(),
 	  {accept_resource, Rnew}
     end.
 
@@ -1139,9 +1138,7 @@ wait_for_bind({xmlstreamelement, El}, StateData) ->
 			      [{elem, <<"resource">>}, cdata]),
 	  R = case jlib:resourceprep(R1) of
 		error -> error;
-		<<"">> ->
-                      iolist_to_binary([randoms:get_string()
-                                        | tuple_to_list(now())]);
+		<<"">> -> randoms:get_string();
 		Resource -> Resource
 	      end,
 	  case R of
diff --git a/src/web/ejabberd_bosh.erl b/src/web/ejabberd_bosh.erl
index 2264aa0eb..5bdc425ad 100644
--- a/src/web/ejabberd_bosh.erl
+++ b/src/web/ejabberd_bosh.erl
@@ -1102,8 +1102,7 @@ start_shaper_timer(Timeout) ->
     erlang:start_timer(Timeout, self(), shaper_timeout).
 
 make_random_jid(Host) ->
-    User = iolist_to_binary([randoms:get_string()
-                             | tuple_to_list(now())]),
+    User = randoms:get_string(),
     jlib:make_jid(User, Host, randoms:get_string()).
 
 make_socket(Pid, IP) -> {http_bind, Pid, IP}.
diff --git a/src/web/ejabberd_http_bind.erl b/src/web/ejabberd_http_bind.erl
index c8b688908..95fb14f8b 100644
--- a/src/web/ejabberd_http_bind.erl
+++ b/src/web/ejabberd_http_bind.erl
@@ -1278,6 +1278,5 @@ get_session(SID) ->
     end.
 
 make_random_jid(Host) ->
-    User = iolist_to_binary([randoms:get_string()
-                             | tuple_to_list(now())]),
+    User = randoms:get_string(),
     jlib:make_jid(User, Host, randoms:get_string()).