diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-11-01 17:23:05 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-11-01 17:23:05 +0000 |
| commit | 4c6e21fbaab56728d0b737efac415993689e92a1 (patch) | |
| tree | 1aaf8718151989500765b62a382e247d55c54745 | |
| parent | b77912abb3fdee4d01aa6a75af6485aa3b7f5b14 (diff) | |
| download | rabbitmq-server-git-4c6e21fbaab56728d0b737efac415993689e92a1.tar.gz | |
Revert the change to check_vhost_access/2
| -rw-r--r-- | src/rabbit_access_control.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl index aebb046f40..4d40ae4ba7 100644 --- a/src/rabbit_access_control.erl +++ b/src/rabbit_access_control.erl @@ -64,7 +64,7 @@ (username(), password()) -> {'ok', rabbit_types:user()} | 'refused'). -spec(check_vhost_access/2 :: - (username(), rabbit_types:vhost()) + (rabbit_types:user(), rabbit_types:vhost()) -> 'ok' | rabbit_types:channel_exit()). -spec(check_resource_access/3 :: (username(), rabbit_types:r(atom()), permission_atom()) @@ -161,7 +161,7 @@ internal_lookup_vhost_access(Username, VHostPath) -> end end). -check_vhost_access(Username, VHostPath) -> +check_vhost_access(#user{username = Username}, VHostPath) -> ?LOGDEBUG("Checking VHost access for ~p to ~p~n", [Username, VHostPath]), case internal_lookup_vhost_access(Username, VHostPath) of {ok, _R} -> diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 2884deb720..29004bd5fb 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -770,8 +770,7 @@ handle_method0(#'connection.open'{virtual_host = VHostPath}, protocol = Protocol}, sock = Sock, stats_timer = StatsTimer}) -> - ok = rabbit_access_control:check_vhost_access( - User#user.username, VHostPath), + ok = rabbit_access_control:check_vhost_access(User, VHostPath), NewConnection = Connection#connection{vhost = VHostPath}, ok = send_on_channel0(Sock, #'connection.open_ok'{}, Protocol), State1 = internal_conserve_memory( |