From 83a8e2f7ba408a03bcf8c8e412817afd301eb637 Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Tue, 30 Sep 2008 16:46:21 +0000 Subject: 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 all " git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@700524 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/acl/AclReader.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'cpp/src/qpid/acl/AclReader.cpp') 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; } -- cgit v1.2.1