summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-01-05 17:44:21 +0000
committerSimon MacMullen <simon@rabbitmq.com>2011-01-05 17:44:21 +0000
commiteefed49f1f8b7ce067270e972860f259bc69e606 (patch)
tree226b96b447fac3ad85a146bde22363489b686263
parent3356b53de2e01b4d8ee787d6cae0d9c5af2f47d9 (diff)
downloadrabbitmq-server-git-eefed49f1f8b7ce067270e972860f259bc69e606.tar.gz
Fix a few spec-related stupidities.
-rw-r--r--include/rabbit_auth_backend_spec.hrl6
-rw-r--r--src/rabbit_access_control.erl2
-rw-r--r--src/rabbit_vhost.erl2
3 files changed, 4 insertions, 6 deletions
diff --git a/include/rabbit_auth_backend_spec.hrl b/include/rabbit_auth_backend_spec.hrl
index d6f78cc2ea..a96c18d825 100644
--- a/include/rabbit_auth_backend_spec.hrl
+++ b/include/rabbit_auth_backend_spec.hrl
@@ -30,16 +30,14 @@
%%
-ifdef(use_specs).
--type(vhost_permission_atom() :: 'read' | 'write').
-
-spec(description/0 :: () -> [{atom(), any()}]).
--spec(check_user_login/2 :: (rabbit_access_control:username(), [term()]) ->
+-spec(check_user_login/2 :: (rabbit_types:username(), [term()]) ->
{'ok', rabbit_types:user()} |
{'refused', string(), [any()]} |
{'error', any()}).
-spec(check_vhost_access/3 :: (rabbit_types:user(), rabbit_types:vhost(),
- vhost_permission_atom()) ->
+ rabbit_access_control:vhost_permission_atom()) ->
boolean() | {'error', any()}).
-spec(check_resource_access/3 :: (rabbit_types:user(),
rabbit_types:r(atom()),
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl
index 84e2b1a50a..02a654420d 100644
--- a/src/rabbit_access_control.erl
+++ b/src/rabbit_access_control.erl
@@ -30,7 +30,7 @@
%%
-module(rabbit_access_control).
--include_lib("stdlib/include/qlc.hrl").
+
-include("rabbit.hrl").
-export([user_pass_login/2, check_user_pass_login/2, check_user_login/2,
diff --git a/src/rabbit_vhost.erl b/src/rabbit_vhost.erl
index 571c68abef..f939a3feb6 100644
--- a/src/rabbit_vhost.erl
+++ b/src/rabbit_vhost.erl
@@ -30,7 +30,7 @@
%%
-module(rabbit_vhost).
-%%-include_lib("stdlib/include/qlc.hrl").
+
-include("rabbit.hrl").
%%----------------------------------------------------------------------------