svn commit: r683087 - in /incubator/qpid/trunk/qpid/cpp/src/qpid: acl/Acl.cpp broker/AclModule.h broker/SessionAdapter.cpp

[cctrieloff]

Author: cctrieloff
Date: Tue Aug  5 19:26:22 2008
New Revision: 683087

URL: http://svn.apache.org/viewvc?rev=683087&view=rev
Log:
correct action on purge & remove ROUTINGKEY type

Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp?rev=683087&r1=683086&r2=683087&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp Tue Aug  5 19:26:22 2008
@@ -64,7 +64,6 @@
          {
       case QUEUE: return "Queue";
          case EXCHANGE: return "Exchnage";
-         case ROUTINGKEY: return "RoutingKey";
          case BROKER: return "Broker";
          case LINK: return "Link";
          case ROUTE: return "Route";

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h?rev=683087&r1=683086&r2=683087&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h Tue Aug  5 
19:26:22 2008
@@ -31,7 +31,7 @@
 namespace qpid {
 
 namespace acl{
-enum ObjectType {QUEUE,EXCHANGE,ROUTINGKEY,BROKER,LINK,ROUTE};
+enum ObjectType {QUEUE,EXCHANGE,BROKER,LINK,ROUTE};
 enum Action {CONSUME,PUBLISH,CREATE,ACCESS,BIND,UNBIND,DELETE,PURGE,UPDATE};
 enum AclResult {ALLOW,ALLOWLOG,DENY,DENYNOLOG};        
 }

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp?rev=683087&r1=683086&r2=683087&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.cpp Tue Aug  5 
19:26:22 2008
@@ -370,7 +370,7 @@
        AclModule* acl = getBroker().getAcl();
        if (acl)
        {
-           if 
(!acl->authorise(getConnection().getUserId(),acl::DELETE,acl::QUEUE,queue,NULL) 
)
+           if 
(!acl->authorise(getConnection().getUserId(),acl::PURGE,acl::QUEUE,queue,NULL) )
                throw NotAllowedException("ACL denied queue purge request");
     }
     getQueue(queue)->purge();