diff options
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/acl/Acl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/acl/Acl.cpp b/qpid/cpp/src/qpid/acl/Acl.cpp index 3d83cb0b2b..9117894d70 100644 --- a/qpid/cpp/src/qpid/acl/Acl.cpp +++ b/qpid/cpp/src/qpid/acl/Acl.cpp @@ -55,7 +55,7 @@ namespace _qmf = qmf::org::apache::qpid::acl; Acl::Acl (AclValues& av, Broker& b): aclValues(av), broker(&b), transferAcl(false), connectionCounter(new ConnectionCounter(*this, aclValues.aclMaxConnectPerUser, aclValues.aclMaxConnectPerIp, aclValues.aclMaxConnectTotal)), - resourceCounter(new ResourceCounter(*this, aclValues.aclMaxQueuesPerUser)),userRules(true) + resourceCounter(new ResourceCounter(*this, aclValues.aclMaxQueuesPerUser)),userRules(false) { if (aclValues.aclMaxConnectPerUser > AclData::getConnectMaxSpec()) @@ -87,7 +87,6 @@ Acl::Acl (AclValues& av, Broker& b): aclValues(av), broker(&b), transferAcl(fals } } else { loadEmptyAclRuleset(); - userRules = false; QPID_LOG(debug, "ACL loaded empty rule set"); } broker->getConnectionObservers().add(connectionCounter); @@ -263,6 +262,7 @@ bool Acl::readAclFile(std::string& aclFile, std::string& errorText) { data = d; } transferAcl = data->transferAcl; // any transfer ACL + userRules = true; // rules in force came from an ACL file if (data->transferAcl){ QPID_LOG(debug,"ACL: Transfer ACL is Enabled!"); |