summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry Kuch <jerryk@vmware.com>2011-09-13 09:24:36 -0700
committerJerry Kuch <jerryk@vmware.com>2011-09-13 09:24:36 -0700
commitbb2b2a7761d3fbba718f4be9637bc52d6a5c3e56 (patch)
tree4711fbee839f39f58d6c721ba5b6626e7077ac65
parent98ff0baab78e942aa9b3f73fd10f21724971abb2 (diff)
parent8da2107b3c3276e610ef7c773756f66c0c3cb6d5 (diff)
downloadrabbitmq-server-bb2b2a7761d3fbba718f4be9637bc52d6a5c3e56.tar.gz
Merge 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},