summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl C. Trieloff <cctrieloff@apache.org>2008-08-05 21:54:15 +0000
committerCarl C. Trieloff <cctrieloff@apache.org>2008-08-05 21:54:15 +0000
commit6cd210d1d606b62db3d4259ae7641ddbaae74731 (patch)
tree61a7df3993a718efc433121b78023434c87a5dab
parent7a3eb589b3973522771c2b40b3ba89ac9cbfdb14 (diff)
downloadqpid-python-6cd210d1d606b62db3d4259ae7641ddbaae74731.tar.gz
Added actions for ACL on mgnt actions
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@682979 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--cpp/src/qpid/acl/Acl.cpp4
-rw-r--r--cpp/src/qpid/broker/AclModule.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/qpid/acl/Acl.cpp b/cpp/src/qpid/acl/Acl.cpp
index 2e13aac7a6..f6d7aa3de9 100644
--- a/cpp/src/qpid/acl/Acl.cpp
+++ b/cpp/src/qpid/acl/Acl.cpp
@@ -53,6 +53,7 @@ using namespace std;
case UNBIND: return "Unbind";
case DELETE: return "Delete";
case PURGE: return "Purge";
+ case UPDATE: return "Update";
default: return "Unknown";
}
}
@@ -64,6 +65,9 @@ using namespace std;
case QUEUE: return "Queue";
case EXCHANGE: return "Exchnage";
case ROUTINGKEY: return "RoutingKey";
+ case BROKER: return "Broker";
+ case LINK: return "Link";
+ case ROUTE: return "Route";
default: return "Unknown";
}
}
diff --git a/cpp/src/qpid/broker/AclModule.h b/cpp/src/qpid/broker/AclModule.h
index c6112e468d..1f9c54c87e 100644
--- a/cpp/src/qpid/broker/AclModule.h
+++ b/cpp/src/qpid/broker/AclModule.h
@@ -31,8 +31,8 @@
namespace qpid {
namespace acl{
-enum ObjectType {QUEUE,EXCHANGE,ROUTINGKEY};
-enum Action {CONSUME,PUBLISH,CREATE,ACCESS,BIND,UNBIND,DELETE,PURGE};
+enum ObjectType {QUEUE,EXCHANGE,ROUTINGKEY,BROKER,LINK,ROUTE};
+enum Action {CONSUME,PUBLISH,CREATE,ACCESS,BIND,UNBIND,DELETE,PURGE,UPDATE};
enum AclResult {ALLOW,ALLOWLOG,DENY,DENYNOLOG};
}