QPID-7236: set action and object in acl rule even when actionAll is true

grs · grs · commit 4871a9f60d7d · 2016-04-28T19:01:49.000Z
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1741495 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/qpid/cpp/src/qpid/acl/AclReader.cpp b/qpid/cpp/src/qpid/acl/AclReader.cpp
@@ -36,7 +36,7 @@
 namespace qpid {
 namespace acl {
 
-    AclReader::aclRule::aclRule(const AclResult r, const std::string n, const groupMap& groups) : res(r), actionAll(true), objStatus(NONE) {
+    AclReader::aclRule::aclRule(const AclResult r, const std::string n, const groupMap& groups) : res(r), actionAll(true), action(ACT_ACCESS), objStatus(NONE), object(OBJ_BROKER) {
         processName(n, groups);
     }
     AclReader::aclRule::aclRule(const AclResult r, const std::string n, const groupMap& groups, const Action a) : res(r), actionAll(false), action(a), objStatus(NONE) {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`namespace qpid {`
`37`	`37`	`namespace acl {`
`38`	`38`
`39`		`- AclReader::aclRule::aclRule(const AclResult r, const std::string n, const groupMap& groups) : res(r), actionAll(true), objStatus(NONE) {`
	`39`	`+ AclReader::aclRule::aclRule(const AclResult r, const std::string n, const groupMap& groups) : res(r), actionAll(true), action(ACT_ACCESS), objStatus(NONE), object(OBJ_BROKER) {`
`40`	`40`	`processName(n, groups);`
`41`	`41`	`}`
`42`	`42`	`AclReader::aclRule::aclRule(const AclResult r, const std::string n, const groupMap& groups, const Action a) : res(r), actionAll(false), action(a), objStatus(NONE) {`