diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2008-09-30 16:46:21 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2008-09-30 16:46:21 +0000 |
| commit | 83a8e2f7ba408a03bcf8c8e412817afd301eb637 (patch) | |
| tree | d824b5e6b1195e6d0cfcc8036816c0cd973d81d8 /cpp/src/qpid/acl/AclReader.cpp | |
| parent | 9b2f2ba1d104ab18e33bbb35082debe129f6cc1d (diff) | |
| download | qpid-python-83a8e2f7ba408a03bcf8c8e412817afd301eb637.tar.gz | |
Added a default value for param in authorize and lookup methods in Acl.h and AclData.h.
This enables the user to call authorize and lookup safely without having to pass params.
Fixed a minor bug in AclReader.cpp to allow the following permission
"acl allow <group or user> all <object_type>"
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@700524 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/acl/AclReader.cpp')
| -rw-r--r-- | cpp/src/qpid/acl/AclReader.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/qpid/acl/AclReader.cpp b/cpp/src/qpid/acl/AclReader.cpp index 0ad92a2243..c27f1a24bf 100644 --- a/cpp/src/qpid/acl/AclReader.cpp +++ b/cpp/src/qpid/acl/AclReader.cpp @@ -402,9 +402,11 @@ bool AclReader::processAclLine(tokList& toks) { } bool actionAllFlag = toks[3].compare("all") == 0; + bool userAllFlag = toks[2].compare("all") == 0; Action action; if (actionAllFlag) { - if (toksSize > 4) { + + if (userAllFlag && toksSize > 4) { QPID_LOG(error, ACL_FORMAT_ERR_LOG_PREFIX << "Tokens found after action \"all\"."); return false; } |