summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-09-13 12:04:15 +0100
committerMatthew Sackman <matthew@rabbitmq.com>2011-09-13 12:04:15 +0100
commit8da2107b3c3276e610ef7c773756f66c0c3cb6d5 (patch)
tree412429a4f7c70c53d5f2d1d887810e1cf0d211c2
parent6a5a56ea911e68f739f2759139c4dc0a93230cba (diff)
parentbfd6d62fe7dca8820ad785e7301ed09cc7d0b5c4 (diff)
downloadrabbitmq-server-8da2107b3c3276e610ef7c773756f66c0c3cb6d5.tar.gz
Merging heads
-rw-r--r--src/rabbit_auth_backend_internal.erl18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/rabbit_auth_backend_internal.erl b/src/rabbit_auth_backend_internal.erl
index 6a018bd1..156d98dc 100644
--- a/src/rabbit_auth_backend_internal.erl
+++ b/src/rabbit_auth_backend_internal.erl
@@ -110,17 +110,13 @@ internal_check_user_login(Username, Fun) ->
Refused
end.
-check_vhost_access(#user{username = Username}, VHost) ->
- %% TODO: use dirty ops instead
- rabbit_misc:execute_mnesia_transaction(
- fun () ->
- case mnesia:read({rabbit_user_permission,
- #user_vhost{username = Username,
- virtual_host = VHost}}) of
- [] -> false;
- [_R] -> true
- end
- end).
+check_vhost_access(#user{username = Username}, VHostPath) ->
+ case mnesia:dirty_read({rabbit_user_permission,
+ #user_vhost{username = Username,
+ virtual_host = VHostPath}}) of
+ [] -> false;
+ [_R] -> true
+ end.
check_resource_access(#user{username = Username},
#resource{virtual_host = VHostPath, name = Name},