diff options
| author | Stephen D. Huston <shuston@apache.org> | 2008-10-30 23:14:51 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2008-10-30 23:14:51 +0000 |
| commit | 5d74de00280c14e33964b099d6658a147479b4ca (patch) | |
| tree | fec5a24b9cf3dda175ca251d5b70ac18897da243 /cpp/src/qpid/broker/ConnectionHandler.cpp | |
| parent | 2abdfc96316de133e2f27ae98027925be5e6741c (diff) | |
| download | qpid-python-5d74de00280c14e33964b099d6658a147479b4ca.tar.gz | |
Adjust ACL-related enums to avoid Windows macro clashes; fixes QPID-1368
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@709283 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/ConnectionHandler.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/ConnectionHandler.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/ConnectionHandler.cpp b/cpp/src/qpid/broker/ConnectionHandler.cpp index dd1ac20dd2..c55db2c339 100644 --- a/cpp/src/qpid/broker/ConnectionHandler.cpp +++ b/cpp/src/qpid/broker/ConnectionHandler.cpp @@ -20,8 +20,6 @@ * */ -#include "config.h" - #include "ConnectionHandler.h" #include "Connection.h" #include "qpid/framing/ClientInvoker.h" @@ -109,7 +107,7 @@ void ConnectionHandler::Handler::startOk(const framing::FieldTable& clientProper connection.setFederationLink(clientProperties.get(QPID_FED_LINK)); connection.setFederationPeerTag(clientProperties.getAsString(QPID_FED_TAG)); if (connection.isFederationLink()) { - if (acl && !acl->authorise(connection.getUserId(),acl::CREATE,acl::LINK,"")){ + if (acl && !acl->authorise(connection.getUserId(),acl::ACT_CREATE,acl::OBJ_LINK,"")){ client.close(framing::connection::CLOSE_CODE_CONNECTION_FORCED,"ACL denied creating a federation link"); return; } |