summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2010-09-07 10:15:08 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2010-09-07 10:15:08 +0100
commitdb30977b7dee6fe4f1ec298339e83fdcd59a98f0 (patch)
tree59aa2c13e6ec9cbd48359f8ce6bfb804c2d2332d
parent6a79b901922b66fcfcc3cdd16ecea3b03137a808 (diff)
downloadrabbitmq-server-db30977b7dee6fe4f1ec298339e83fdcd59a98f0.tar.gz
correct the type specs of permission listing functions
these got broken when 'scope' was added
-rw-r--r--src/rabbit_access_control.erl7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl
index 05d31a8f..33b644df 100644
--- a/src/rabbit_access_control.erl
+++ b/src/rabbit_access_control.erl
@@ -52,6 +52,7 @@
-type(password() :: binary()).
-type(regexp() :: binary()).
-type(scope() :: binary()).
+-type(scope_atom() :: 'client' | 'all').
-spec(check_login/2 ::
(binary(), binary()) -> rabbit_types:user() |
@@ -84,10 +85,12 @@
-spec(clear_permissions/2 :: (username(), rabbit_types:vhost()) -> 'ok').
-spec(list_vhost_permissions/1 ::
(rabbit_types:vhost())
- -> [{username(), regexp(), regexp(), regexp()}]).
+ -> [{username(), regexp(), regexp(), regexp(),
+ scope_atom()}]).
-spec(list_user_permissions/1 ::
(username())
- -> [{rabbit_types:vhost(), regexp(), regexp(), regexp()}]).
+ -> [{rabbit_types:vhost(), regexp(), regexp(), regexp(),
+ scope_atom()}]).
-endif.