diff options
| author | Gordon Sim <gsim@apache.org> | 2011-01-17 22:11:35 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2011-01-17 22:11:35 +0000 |
| commit | 12ee5f96c705084ebc575c6396fd2d2a714176c1 (patch) | |
| tree | 0ff8473e42c0b08401779269379616bd606cd7aa /cpp/src | |
| parent | 721229fd334269ed733ccf76cf93ff0e95882514 (diff) | |
| download | qpid-python-12ee5f96c705084ebc575c6396fd2d2a714176c1.tar.gz | |
QPID-3006: remove incorrect and unnecessary authorisation check
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1060110 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/broker/Link.cpp | 13 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/Link.h | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/cpp/src/qpid/broker/Link.cpp b/cpp/src/qpid/broker/Link.cpp index c13a24da95..5a50d26c8c 100644 --- a/cpp/src/qpid/broker/Link.cpp +++ b/cpp/src/qpid/broker/Link.cpp @@ -174,18 +174,6 @@ void Link::closed (int, std::string text) destroy(); } -void Link::checkClosePermission() -{ - Mutex::ScopedLock mutex(lock); - - AclModule* acl = getBroker()->getAcl(); - std::string userID = getUsername() + "@" + getBroker()->getOptions().realm; - if (acl && !acl->authorise(userID,acl::ACT_DELETE,acl::OBJ_LINK,"")){ - throw UnauthorizedAccessException("ACL denied delete link request"); - } -} - - void Link::destroy () { Bridges toDelete; @@ -415,7 +403,6 @@ Manageable::status_t Link::ManagementMethod (uint32_t op, Args& args, string& te switch (op) { case _qmf::Link::METHOD_CLOSE : - checkClosePermission(); if (!closing) { closing = true; if (state != STATE_CONNECTING && connection) { diff --git a/cpp/src/qpid/broker/Link.h b/cpp/src/qpid/broker/Link.h index bd74fe2a2f..75a680ff5d 100644 --- a/cpp/src/qpid/broker/Link.h +++ b/cpp/src/qpid/broker/Link.h @@ -85,7 +85,6 @@ namespace qpid { void destroy(); // Called when mgmt deletes this link void ioThreadProcessing(); // Called on connection's IO thread by request bool tryFailover(); // Called during maintenance visit - void checkClosePermission(); // ACL check for explict mgmt call to close this link public: typedef boost::shared_ptr<Link> shared_ptr; |