From 82a46e94dec53c89456af1c5efe68f9ec02271cd Mon Sep 17 00:00:00 2001
From: Marek Majkowski <marek@rabbitmq.com>
Date: Tue, 2 Nov 2010 15:39:30 +0000
Subject: remove repetition + formatting

---
 src/rabbit_access_control.erl | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl
index bc0fe463..15897dfa 100644
--- a/src/rabbit_access_control.erl
+++ b/src/rabbit_access_control.erl
@@ -247,12 +247,7 @@ delete_user(Username) ->
     R.
 
 change_password(Username, Password) ->
-    R = update_user(Username, fun(User) ->
-                                      User#user{
-                                        password_hash = hash_password(Password)}
-                              end),
-    rabbit_log:info("Changed password for user ~p~n", [Username]),
-    R.
+    change_password_hash(Username, hash_password(Password)).
 
 change_password_hash(Username, PasswordHash) ->
     R = update_user(Username, fun(User) ->
@@ -272,8 +267,8 @@ check_password(Cleartext, <<Salt:4/binary, Hash/binary>>) ->
 make_salt() ->
     {A1,A2,A3} = now(),
     random:seed(A1, A2, A3),
-    Salt0 = random:uniform(16#ffffffff),
-    <<Salt0:32>>.
+    Salt = random:uniform(16#ffffffff),
+    <<Salt:32>>.
 
 salted_md5(Salt, Cleartext) ->
     Salted = <<Salt/binary, Cleartext/binary>>,
-- 
cgit v1.2.1