diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2011-06-28 07:07:52 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2011-06-28 07:07:52 +0100 |
| commit | f1a7fc4cfcf0e566a1cf3f76ca3e73e242d43d6d (patch) | |
| tree | 5a96bb1a0add471e369fe4fc9f13f38ba047faeb /include | |
| parent | ecf2ee32580ed5728a4f9845fe0640120e791e17 (diff) | |
| parent | 3e8acf0f3868f3afcd7a6121866fc0cd0f7a8cde (diff) | |
| download | rabbitmq-server-git-f1a7fc4cfcf0e566a1cf3f76ca3e73e242d43d6d.tar.gz | |
merge bug24180 into default
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 6 | ||||
| -rw-r--r-- | include/rabbit_auth_backend_spec.hrl | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 67e2dfe5fa..00b7e6e9b7 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -15,12 +15,12 @@ %% -record(user, {username, - is_admin, + tags, auth_backend, %% Module this user came from impl %% Scratch space for that module }). --record(internal_user, {username, password_hash, is_admin}). +-record(internal_user, {username, password_hash, tags}). -record(permission, {configure, write, read}). -record(user_vhost, {username, virtual_host}). -record(user_permission, {user_vhost, permission}). @@ -46,7 +46,7 @@ -record(exchange_serial, {name, next}). -record(amqqueue, {name, durable, auto_delete, exclusive_owner = none, - arguments, pid}). + arguments, pid, slave_pids, mirror_nodes}). %% mnesia doesn't like unary records, so we add a dummy 'value' field -record(route, {binding, value = const}). diff --git a/include/rabbit_auth_backend_spec.hrl b/include/rabbit_auth_backend_spec.hrl index e26d44ea94..803bb75ce7 100644 --- a/include/rabbit_auth_backend_spec.hrl +++ b/include/rabbit_auth_backend_spec.hrl @@ -22,8 +22,7 @@ {'ok', rabbit_types:user()} | {'refused', string(), [any()]} | {'error', any()}). --spec(check_vhost_access/3 :: (rabbit_types:user(), rabbit_types:vhost(), - rabbit_access_control:vhost_permission_atom()) -> +-spec(check_vhost_access/2 :: (rabbit_types:user(), rabbit_types:vhost()) -> boolean() | {'error', any()}). -spec(check_resource_access/3 :: (rabbit_types:user(), rabbit_types:r(atom()), |