diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/acl/Acl.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/AclModule.h | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/SessionAdapter.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/qpid/acl/Acl.cpp b/cpp/src/qpid/acl/Acl.cpp index f6d7aa3de9..79e4af57ee 100644 --- a/cpp/src/qpid/acl/Acl.cpp +++ b/cpp/src/qpid/acl/Acl.cpp @@ -64,7 +64,6 @@ using namespace std; { case QUEUE: return "Queue"; case EXCHANGE: return "Exchnage"; - case ROUTINGKEY: return "RoutingKey"; case BROKER: return "Broker"; case LINK: return "Link"; case ROUTE: return "Route"; diff --git a/cpp/src/qpid/broker/AclModule.h b/cpp/src/qpid/broker/AclModule.h index 1f9c54c87e..f766978d18 100644 --- a/cpp/src/qpid/broker/AclModule.h +++ b/cpp/src/qpid/broker/AclModule.h @@ -31,7 +31,7 @@ namespace qpid { namespace acl{ -enum ObjectType {QUEUE,EXCHANGE,ROUTINGKEY,BROKER,LINK,ROUTE}; +enum ObjectType {QUEUE,EXCHANGE,BROKER,LINK,ROUTE}; enum Action {CONSUME,PUBLISH,CREATE,ACCESS,BIND,UNBIND,DELETE,PURGE,UPDATE}; enum AclResult {ALLOW,ALLOWLOG,DENY,DENYNOLOG}; } diff --git a/cpp/src/qpid/broker/SessionAdapter.cpp b/cpp/src/qpid/broker/SessionAdapter.cpp index 1aeced49c1..03022b00bb 100644 --- a/cpp/src/qpid/broker/SessionAdapter.cpp +++ b/cpp/src/qpid/broker/SessionAdapter.cpp @@ -370,7 +370,7 @@ void SessionAdapter::QueueHandlerImpl::purge(const string& queue){ AclModule* acl = getBroker().getAcl(); if (acl) { - if (!acl->authorise(getConnection().getUserId(),acl::DELETE,acl::QUEUE,queue,NULL) ) + if (!acl->authorise(getConnection().getUserId(),acl::PURGE,acl::QUEUE,queue,NULL) ) throw NotAllowedException("ACL denied queue purge request"); } getQueue(queue)->purge(); |