diff options
| author | Stephen D. Huston <shuston@apache.org> | 2008-10-30 23:41:45 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2008-10-30 23:41:45 +0000 |
| commit | 4838770162f6d305696606d421b87481e2356038 (patch) | |
| tree | a1362724cc994856bcb793cc9b7cfde996ab4fe5 /cpp/src/qpid/acl | |
| parent | ab3de44358744a5b7fc007c6f588058e031bd25b (diff) | |
| download | qpid-python-4838770162f6d305696606d421b87481e2356038.tar.gz | |
Fix Acl references related to QPID-1368
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@709293 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/acl')
| -rw-r--r-- | cpp/src/qpid/acl/AclData.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/qpid/acl/AclReader.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/qpid/acl/AclData.cpp b/cpp/src/qpid/acl/AclData.cpp index fce7182140..d2a55c0027 100644 --- a/cpp/src/qpid/acl/AclData.cpp +++ b/cpp/src/qpid/acl/AclData.cpp @@ -71,7 +71,7 @@ AclResult AclData::lookup(const std::string& id, const Action& action, const Obj for (propertyMapItr pMItr = i->props.begin(); (pMItr != i->props.end()) && match; pMItr++) { //match name is exists first - if (pMItr->first == acl::NAME){ + if (pMItr->first == acl::PROP_NAME){ if (!matchProp(pMItr->second, name)){ match= false; } @@ -109,11 +109,11 @@ AclResult AclData::lookup(const std::string& id, const Action& action, const Obj for (propertyMapItr pMItr = i->props.begin(); (pMItr != i->props.end()) && match; pMItr++) { //match name is exists first - if (pMItr->first == acl::NAME){ + if (pMItr->first == acl::PROP_NAME){ if (!matchProp(pMItr->second, name)){ match= false; } - }else if (pMItr->first == acl::ROUTINGKEY){ + }else if (pMItr->first == acl::PROP_ROUTINGKEY){ if (!matchProp(pMItr->second, RoutingKey)){ match= false; } diff --git a/cpp/src/qpid/acl/AclReader.cpp b/cpp/src/qpid/acl/AclReader.cpp index b0b95dc9fc..3e55beaf67 100644 --- a/cpp/src/qpid/acl/AclReader.cpp +++ b/cpp/src/qpid/acl/AclReader.cpp @@ -130,7 +130,7 @@ void AclReader::loadDecisionData( boost::shared_ptr<AclData> d ) for (int acnt= ((*i)->actionAll?0:(*i)->action); acnt< acl::ACTIONSIZE; (*i)->actionAll?acnt++:acnt=acl::ACTIONSIZE ) { - if (acnt == acl::PUBLISH) d->transferAcl = true; // we have transfer ACL + if (acnt == acl::ACT_PUBLISH) d->transferAcl = true; // we have transfer ACL QPID_LOG(debug, "ACL Adding action:" << AclHelper::getActionStr((Action)acnt) ); @@ -414,7 +414,7 @@ bool AclReader::processAclLine(tokList& toks) { errorStream << ACL_FORMAT_ERR_LOG_PREFIX << "Tokens found after action \"all\"."; return false; } - action = CONSUME; // dummy; compiler must initialize action for this code path + action = ACT_CONSUME; // dummy; compiler must initialize action for this code path } else { try { action = AclHelper::getAction(toks[3]); |