diff options
| author | Tim Watson <tim@rabbitmq.com> | 2013-06-06 10:40:01 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2013-06-06 10:40:01 +0100 |
| commit | 348d153ee1149c2c0911940e658d87abe06eeb48 (patch) | |
| tree | dfaa8dca979ae64b474cbe5845589c452723b179 /src | |
| parent | 8775d3f9c7a36cbc6a06a1fe13a217df0d0f479a (diff) | |
| parent | 818fa1245361271114ffc66d418ea6f8c9d5f10e (diff) | |
| download | rabbitmq-server-git-348d153ee1149c2c0911940e658d87abe06eeb48.tar.gz | |
merge stable into default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_access_control.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl index 5b92a5c3f4..b4179ec5aa 100644 --- a/src/rabbit_access_control.erl +++ b/src/rabbit_access_control.erl @@ -68,8 +68,11 @@ check_vhost_access(User = #user{ username = Username, auth_backend = Module }, VHostPath) -> check_access( fun() -> - rabbit_vhost:exists(VHostPath) andalso - Module:check_vhost_access(User, VHostPath) + %% TODO this could be an andalso shortcut under >R13A + case rabbit_vhost:exists(VHostPath) of + false -> false; + true -> Module:check_vhost_access(User, VHostPath) + end end, Module, "access to vhost '~s' refused for user '~s'", [VHostPath, Username]). |