From 5d74de00280c14e33964b099d6658a147479b4ca Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Thu, 30 Oct 2008 23:14:51 +0000 Subject: 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 --- cpp/src/qpid/broker/ConnectionHandler.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'cpp/src/qpid/broker/ConnectionHandler.cpp') 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; } -- cgit v1.2.1