diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2017-06-02 18:57:08 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2017-06-26 15:56:19 +0200 |
| commit | 7d60ecd6393856d8a611edbdb259eb7468af729e (patch) | |
| tree | ccca5e969275ab4cf862c421c35d111d7ea7efbd /src | |
| parent | 9013870415e3c887a107134c035af0f74f3f4f93 (diff) | |
| download | rabbitmq-server-git-7d60ecd6393856d8a611edbdb259eb7468af729e.tar.gz | |
rabbit_auth_backend_internal: with_user_and_vhost() was moved
... to rabbit_vhost.
[#118490793]
(cherry picked from commit d5b5b8089b249eb36d074b296b13f753e24b932f)
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_auth_backend_internal.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/rabbit_auth_backend_internal.erl b/src/rabbit_auth_backend_internal.erl index 2531813cb3..7335a35242 100644 --- a/src/rabbit_auth_backend_internal.erl +++ b/src/rabbit_auth_backend_internal.erl @@ -340,7 +340,7 @@ set_permissions(Username, VHostPath, ConfigurePerm, WritePerm, ReadPerm, ActingU end end, [ConfigurePerm, WritePerm, ReadPerm]), R = rabbit_misc:execute_mnesia_transaction( - rabbit_misc:with_user_and_vhost( + rabbit_vhost:with_user_and_vhost( Username, VHostPath, fun () -> ok = mnesia:write( rabbit_user_permission, @@ -363,7 +363,7 @@ set_permissions(Username, VHostPath, ConfigurePerm, WritePerm, ReadPerm, ActingU clear_permissions(Username, VHostPath, ActingUser) -> R = rabbit_misc:execute_mnesia_transaction( - rabbit_misc:with_user_and_vhost( + rabbit_vhost:with_user_and_vhost( Username, VHostPath, fun () -> ok = mnesia:delete({rabbit_user_permission, @@ -397,7 +397,7 @@ set_topic_permissions(Username, VHostPath, Exchange, WritePerm, ReadPerm, Acting end end, [WritePerm, ReadPerm]), R = rabbit_misc:execute_mnesia_transaction( - rabbit_misc:with_user_and_vhost( + rabbit_vhost:with_user_and_vhost( Username, VHostPath, fun () -> ok = mnesia:write( rabbit_topic_permission, @@ -426,7 +426,7 @@ set_topic_permissions(Username, VHostPath, Exchange, WritePerm, ReadPerm, Acting clear_topic_permissions(Username, VHostPath, ActingUser) -> R = rabbit_misc:execute_mnesia_transaction( - rabbit_misc:with_user_and_vhost( + rabbit_vhost:with_user_and_vhost( Username, VHostPath, fun () -> ListFunction = match_user_vhost_topic_permission(Username, VHostPath), @@ -442,7 +442,7 @@ clear_topic_permissions(Username, VHostPath, ActingUser) -> clear_topic_permissions(Username, VHostPath, Exchange, ActingUser) -> R = rabbit_misc:execute_mnesia_transaction( - rabbit_misc:with_user_and_vhost( + rabbit_vhost:with_user_and_vhost( Username, VHostPath, fun () -> ok = mnesia:delete(rabbit_topic_permission, @@ -525,7 +525,7 @@ list_vhost_permissions(VHostPath, Ref, AggregatorPid) -> list_user_vhost_permissions(Username, VHostPath) -> list_permissions( user_vhost_perms_info_keys(), - rabbit_misc:with_user_and_vhost( + rabbit_vhost:with_user_and_vhost( Username, VHostPath, match_user_vhost(Username, VHostPath))). extract_user_permission_params(Keys, #user_permission{ @@ -568,7 +568,7 @@ list_vhost_topic_permissions(VHost) -> list_user_vhost_topic_permissions(Username, VHost) -> list_topic_permissions(user_vhost_topic_perms_info_keys(), - rabbit_misc:with_user_and_vhost(Username, VHost, match_user_vhost_topic_permission(Username, VHost))). + rabbit_vhost:with_user_and_vhost(Username, VHost, match_user_vhost_topic_permission(Username, VHost))). list_topic_permissions(Keys, QueryThunk) -> [extract_topic_permission_params(Keys, U) || |