diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2008-11-06 20:07:14 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2008-11-06 20:07:14 +0000 |
| commit | e1132d45340a4d1c91648cac856803428d2a60f4 (patch) | |
| tree | 5109e258e838c67371d762fd73240f777efa2c50 /cpp/src/qpid/broker | |
| parent | ee4d8230649fa7ebb5a8688b7a5fdc7da519f1f7 (diff) | |
| download | qpid-python-e1132d45340a4d1c91648cac856803428d2a60f4.tar.gz | |
Removed the --enforce-acl option. Instead if a policy file is specified acl will be enabled.
Also removed Route from the Object list and did a bit of code cleanup.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@711957 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker')
| -rw-r--r-- | cpp/src/qpid/broker/AclModule.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/cpp/src/qpid/broker/AclModule.h b/cpp/src/qpid/broker/AclModule.h index 92dac50220..4bb6ca12b4 100644 --- a/cpp/src/qpid/broker/AclModule.h +++ b/cpp/src/qpid/broker/AclModule.h @@ -33,7 +33,7 @@ namespace qpid { namespace acl { -enum ObjectType {OBJ_QUEUE, OBJ_EXCHANGE, OBJ_BROKER, OBJ_LINK, OBJ_ROUTE, +enum ObjectType {OBJ_QUEUE, OBJ_EXCHANGE, OBJ_BROKER, OBJ_LINK, OBJ_METHOD, OBJECTSIZE}; // OBJECTSIZE must be last in list enum Action {ACT_CONSUME, ACT_PUBLISH, ACT_CREATE, ACT_ACCESS, ACT_BIND, ACT_UNBIND, ACT_DELETE, ACT_PURGE, ACT_UPDATE, @@ -79,7 +79,6 @@ class AclHelper { if (str.compare("exchange") == 0) return OBJ_EXCHANGE; if (str.compare("broker") == 0) return OBJ_BROKER; if (str.compare("link") == 0) return OBJ_LINK; - if (str.compare("route") == 0) return OBJ_ROUTE; if (str.compare("method") == 0) return OBJ_METHOD; throw str; } @@ -89,7 +88,6 @@ class AclHelper { case OBJ_EXCHANGE: return "exchange"; case OBJ_BROKER: return "broker"; case OBJ_LINK: return "link"; - case OBJ_ROUTE: return "route"; case OBJ_METHOD: return "method"; default: assert(false); // should never get here } @@ -237,16 +235,8 @@ class AclHelper { actionMapPtr a2(new actionMap); a2->insert(actionPair(ACT_CREATE, p0)); - - map->insert(objectPair(OBJ_LINK, a2)); - - // == Route == - actionMapPtr a3(new actionMap); - a3->insert(actionPair(ACT_CREATE, p0)); - a3->insert(actionPair(ACT_DELETE, p0)); - - map->insert(objectPair(OBJ_ROUTE, a3)); + map->insert(objectPair(OBJ_LINK, a2)); // == Method == |