qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r1574490 - /qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp
Date Wed, 05 Mar 2014 13:54:06 GMT
Author: chug
Date: Wed Mar  5 13:54:06 2014
New Revision: 1574490

URL: http://svn.apache.org/r1574490
Log:
QPID-5599: C++ Broker silently ignores --max-connections option when no ACL file is loaded

Subsequent reloads of the ACL file did not reflect that the rule set in force
was created by a user.


Modified:
    qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp?rev=1574490&r1=1574489&r2=1574490&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp Wed Mar  5 13:54:06 2014
@@ -55,7 +55,7 @@ namespace _qmf = qmf::org::apache::qpid:
 
 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): acl
         }
     } 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& aclFi
         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!");



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message