From 6cd210d1d606b62db3d4259ae7641ddbaae74731 Mon Sep 17 00:00:00 2001
From: "Carl C. Trieloff" <cctrieloff@apache.org>
Date: Tue, 5 Aug 2008 21:54:15 +0000
Subject: 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
---
 cpp/src/qpid/acl/Acl.cpp        | 4 ++++
 cpp/src/qpid/broker/AclModule.h | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'cpp/src')

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};	
 }
 
-- 
cgit v1.2.1