diff options
author | Tim Watson <tim@rabbitmq.com> | 2013-06-06 10:39:44 +0100 |
---|---|---|
committer | Tim Watson <tim@rabbitmq.com> | 2013-06-06 10:39:44 +0100 |
commit | 0b0da3203790cb851931a167e007f59c608d586a (patch) | |
tree | 9beff2127e1f134c8d0aeec80d097ab4e1422ce7 | |
parent | a41af647791ac3a3de76364c7e352863c106f50e (diff) | |
parent | 15702b503242a2750e6da46b5cdee7593fb555b9 (diff) | |
download | rabbitmq-server-0b0da3203790cb851931a167e007f59c608d586a.tar.gz |
merge bug25573 into stable
-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 16387268..cbe89a17 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, "~s failed checking vhost access to ~s for ~s: ~p~n", [Module, VHostPath, Username], |