diff options
| author | Charles E. Rolke <chug@apache.org> | 2014-03-04 21:46:24 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2014-03-04 21:46:24 +0000 |
| commit | 291bbc2729009bac61602fcb268af619df764bbb (patch) | |
| tree | c7c961377100ab8d4ca858d4c0fd40209f2c8c29 /qpid/cpp/src/qpid/acl | |
| parent | 32ff4915c0ad83a6c832c96edb319c794c7d3ced (diff) | |
| download | qpid-python-291bbc2729009bac61602fcb268af619df764bbb.tar.gz | |
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.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1574219 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/acl')
| -rw-r--r-- | qpid/cpp/src/qpid/acl/AclPlugin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/acl/AclPlugin.cpp b/qpid/cpp/src/qpid/acl/AclPlugin.cpp index 8a8223230f..04044867ec 100644 --- a/qpid/cpp/src/qpid/acl/AclPlugin.cpp +++ b/qpid/cpp/src/qpid/acl/AclPlugin.cpp @@ -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) { |