You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by cc...@apache.org on 2008/09/19 21:12:10 UTC
svn commit: r697191 - in /incubator/qpid/trunk/qpid/cpp/src/qpid/acl:
AclData.cpp AclReader.cpp
Author: cctrieloff
Date: Fri Sep 19 12:12:10 2008
New Revision: 697191
URL: http://svn.apache.org/viewvc?rev=697191&view=rev
Log:
- fix 'all' user rules to match if not in user db.
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclData.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclReader.cpp
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclData.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclData.cpp?rev=697191&r1=697190&r2=697191&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclData.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclData.cpp Fri Sep 19 12:12:10 2008
@@ -59,6 +59,8 @@
if (actionList[action] && actionList[action][objType]){
AclData::actObjItr itrRule = actionList[action][objType]->find(id);
+ if (itrRule != actionList[action][objType]->end())
+ itrRule = actionList[action][objType]->find("*");
if (itrRule != actionList[action][objType]->end() ) {
//loop the vector
@@ -95,6 +97,8 @@
if (actionList[action] && actionList[action][objType]){
AclData::actObjItr itrRule = actionList[action][objType]->find(id);
+ if (itrRule != actionList[action][objType]->end())
+ itrRule = actionList[action][objType]->find("*");
if (itrRule != actionList[action][objType]->end() ) {
//loop the vector
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclReader.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclReader.cpp?rev=697191&r1=697190&r2=697191&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclReader.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/acl/AclReader.cpp Fri Sep 19 12:12:10 2008
@@ -207,6 +207,7 @@
AclReader::AclReader() : lineNumber(0), contFlag(false), validationMap(new AclHelper::objectMap) {
AclHelper::loadValidationMap(validationMap);
+ names.insert("*");
}
AclReader::~AclReader() {}