diff options
| author | Carl C. Trieloff <cctrieloff@apache.org> | 2008-09-19 19:12:10 +0000 |
|---|---|---|
| committer | Carl C. Trieloff <cctrieloff@apache.org> | 2008-09-19 19:12:10 +0000 |
| commit | 7815b840b386dcb87038b5da6037bf02938630b2 (patch) | |
| tree | 6af6f2e91914400d27436759dd1ed6f672b29857 /qpid/cpp | |
| parent | 615b8ac47279f8b98d4d31b7dacdd7ad07b1feeb (diff) | |
| download | qpid-python-7815b840b386dcb87038b5da6037bf02938630b2.tar.gz | |
- fix 'all' user rules to match if not in user db.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@697191 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/src/qpid/acl/AclData.cpp | 4 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/acl/AclReader.cpp | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/acl/AclData.cpp b/qpid/cpp/src/qpid/acl/AclData.cpp index ee8b3b1b7d..b9501ce6c1 100644 --- a/qpid/cpp/src/qpid/acl/AclData.cpp +++ b/qpid/cpp/src/qpid/acl/AclData.cpp @@ -59,6 +59,8 @@ AclResult AclData::lookup(const std::string& id, const Action& action, const Obj 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 @@ AclResult AclData::lookup(const std::string& id, const Action& action, const Obj 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 diff --git a/qpid/cpp/src/qpid/acl/AclReader.cpp b/qpid/cpp/src/qpid/acl/AclReader.cpp index ee29426a25..0ad92a2243 100644 --- a/qpid/cpp/src/qpid/acl/AclReader.cpp +++ b/qpid/cpp/src/qpid/acl/AclReader.cpp @@ -207,6 +207,7 @@ void AclReader::aclRule::processName(const std::string& name, const groupMap& gr AclReader::AclReader() : lineNumber(0), contFlag(false), validationMap(new AclHelper::objectMap) { AclHelper::loadValidationMap(validationMap); + names.insert("*"); } AclReader::~AclReader() {} |