summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-11-22 12:38:01 +0000
committerSimon MacMullen <simon@rabbitmq.com>2010-11-22 12:38:01 +0000
commit14966ae7595dd227d1f169c14c19a91588e8a5f6 (patch)
treec161b169a8e1bcb5f088c172eb5ed6840e31709c
parentcfdc1c4915babc77e9a6e702363d83970d67a559 (diff)
downloadrabbitmq-server-14966ae7595dd227d1f169c14c19a91588e8a5f6.tar.gz
Improve consistency.
-rw-r--r--src/rabbit_access_control.erl4
-rw-r--r--src/rabbit_auth_backend_internal.erl4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl
index e4836370..dd2d9124 100644
--- a/src/rabbit_access_control.erl
+++ b/src/rabbit_access_control.erl
@@ -125,9 +125,9 @@ check_vhost_access(User = #user{ username = Username,
auth_backend = Module }, VHostPath) ->
?LOGDEBUG("Checking VHost access for ~p to ~p~n", [Username, VHostPath]),
case Module:check_vhost_access(User, VHostPath) of
- ok ->
+ true ->
ok;
- not_found ->
+ false ->
rabbit_misc:protocol_error(
access_refused, "access to vhost '~s' refused for user '~s'",
[VHostPath, Username])
diff --git a/src/rabbit_auth_backend_internal.erl b/src/rabbit_auth_backend_internal.erl
index 605ebc84..bf736775 100644
--- a/src/rabbit_auth_backend_internal.erl
+++ b/src/rabbit_auth_backend_internal.erl
@@ -78,8 +78,8 @@ check_vhost_access(#user{username = Username}, VHostPath) ->
case mnesia:read({rabbit_user_permission,
#user_vhost{username = Username,
virtual_host = VHostPath}}) of
- [] -> not_found;
- [_R] -> ok
+ [] -> false;
+ [_R] -> true
end
end).