summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-11-23 11:26:24 +0000
committerSimon MacMullen <simon@rabbitmq.com>2010-11-23 11:26:24 +0000
commit556cfd5e2fa6ee9e2c9282749d844157fb7e4d55 (patch)
treed806c4dde4347d8aecde16540d1f0c40bc9f0599
parentd5ef3f6cb936bbc72084316de6d53bde169b1d9b (diff)
downloadrabbitmq-server-git-556cfd5e2fa6ee9e2c9282749d844157fb7e4d55.tar.gz
Fix some whitespace issues, add a note
-rw-r--r--src/rabbit_access_control.erl7
-rw-r--r--src/rabbit_auth_backend_internal.erl2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl
index 40e3cb7e9a..569d2e9f73 100644
--- a/src/rabbit_access_control.erl
+++ b/src/rabbit_access_control.erl
@@ -33,9 +33,9 @@
-include_lib("stdlib/include/qlc.hrl").
-include("rabbit.hrl").
--export([user_pass_login/2, check_user_pass_login/2, check_user_login/2,
- make_salt/0, check_password/2, check_vhost_access/2,
- check_resource_access/3, list_vhosts/1]).
+-export([user_pass_login/2, check_user_pass_login/2, check_user_login/2,
+ make_salt/0, check_password/2, check_vhost_access/2,
+ check_resource_access/3, list_vhosts/1]).
-export([add_user/2, delete_user/1, change_password/2, set_admin/1,
clear_admin/1, list_users/0, lookup_user/1]).
-export([change_password_hash/2]).
@@ -158,6 +158,7 @@ list_vhosts(User = #user{auth_backend = Module}) ->
Module:check_vhost_access(User, VHost, read)
end, list_vhosts()).
+%% TODO move almost everything below this line to rabbit_auth_backend_internal
%%----------------------------------------------------------------------------
add_user(Username, Password) ->
diff --git a/src/rabbit_auth_backend_internal.erl b/src/rabbit_auth_backend_internal.erl
index c582c0d113..f375d53ade 100644
--- a/src/rabbit_auth_backend_internal.erl
+++ b/src/rabbit_auth_backend_internal.erl
@@ -51,7 +51,7 @@ check_user_login(Username, [{password, Password}]) ->
internal_check_user_login(
Username,
fun(#internal_user{password_hash = Hash}) ->
- rabbit_access_control:check_password(Password, Hash)
+ rabbit_access_control:check_password(Password, Hash)
end);
check_user_login(Username, AuthProps) ->
exit({unknown_auth_props, Username, AuthProps}).