Author: chug
Date: Tue Mar 4 21:46:24 2014
New Revision: 1574219
URL: http://svn.apache.org/r1574219
Log:
QPID-5599: C++ Broker silently ignores --max-connections option when no ACL
file is loaded
Temporarily revert creation of ACL with null rule set as it subverts
the CREATE LINK security check and self test. Real fix coming shortly.
Modified:
qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp?rev=1574219&r1=1574218&r2=1574219&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp Tue Mar 4 21:46:24 2014
@@ -71,11 +71,11 @@ struct AclPlugin : public Plugin {
sys::Path dataDir(b.getDataDir().getPath());
if (!aclFile.isAbsolute() && !dataDir.empty())
values.aclFile = (dataDir + aclFile).str();
- }
- acl = new Acl(values, b);
- b.setAcl(acl.get());
- b.addFinalizer(boost::bind(&AclPlugin::shutdown, this));
+ acl = new Acl(values, b);
+ b.setAcl(acl.get());
+ b.addFinalizer(boost::bind(&AclPlugin::shutdown, this));
+ }
}
template <class T> bool init(Plugin::Target& target) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
