QPID-107 swap the enforce defualt to ACL has to be turned on. So defualt install can do something...

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@692217 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 6 insertions, 6 deletions

diff --git a/cpp/src/qpid/acl/Acl.cpp b/cpp/src/qpid/acl/Acl.cpp
index f4ed9834d9..982b9e3bb0 100644
--- a/cpp/src/qpid/acl/Acl.cpp
+++ b/cpp/src/qpid/acl/Acl.cpp
@@ -43,7 +43,7 @@ using namespace std;
 
    bool Acl::authorise(const std::string& id, const Action& action, const ObjectType& objType, const std::string& name, std::map<Property, std::string>* params)
    {
-      if (aclValues.noEnforce) return true;
+      if (!aclValues.enforce) return true;
       boost::shared_ptr<AclData> dataLocal = data;  //rcu copy
       
       // add real ACL check here... 
@@ -55,7 +55,7 @@ using namespace std;
 
    bool Acl::authorise(const std::string& id, const Action& action, const ObjectType& objType, const std::string& ExchangeName, const std::string& RoutingKey)
    {
-      if (aclValues.noEnforce) return true;
+      if (!aclValues.enforce) return true;
       boost::shared_ptr<AclData> dataLocal = data;  //rcu copy
       
       // only use dataLocal here...
diff --git a/cpp/src/qpid/acl/Acl.h b/cpp/src/qpid/acl/Acl.h
index 2015c3555f..67051d6392 100644
--- a/cpp/src/qpid/acl/Acl.h
+++ b/cpp/src/qpid/acl/Acl.h
@@ -38,10 +38,10 @@ class Broker;
 namespace acl {
 
 struct AclValues {
-	bool noEnforce;
+	bool enforce;
     std::string aclFile;
 
-    AclValues() {noEnforce = false; aclFile = "policy.acl"; }
+    AclValues() {enforce = false; aclFile = "policy.acl"; }
 };
 
 
diff --git a/cpp/src/qpid/acl/AclPlugin.cpp b/cpp/src/qpid/acl/AclPlugin.cpp
index a025354f13..6f20ea09be 100644
--- a/cpp/src/qpid/acl/AclPlugin.cpp
+++ b/cpp/src/qpid/acl/AclPlugin.cpp
@@ -40,7 +40,7 @@ struct AclOptions : public Options {
 
     AclOptions(AclValues& v) : Options("ACL Options"), values(v) {
         addOptions()
-            ("no-enforce-acl", optValue(values.noEnforce), "Do not enforce ACL")
+            ("enforce-acl", optValue(values.enforce), "Enforce ACL")
             ("acl-file", optValue(values.aclFile, "FILE"), "The policy file to load from, loaded from data dir")
             ;
     }
@@ -57,7 +57,7 @@ struct AclPlugin : public Plugin {
     Options* getOptions() { return &options; }
 
     void init(broker::Broker& b) {
-        if (values.noEnforce){
+        if (!values.enforce){
 		    QPID_LOG(info, "ACL Disabled, no ACL checking being done.");
 			return;  
 		}