From 461f52d8d47d64ca3af2caf7251fda1e8a9bc20a Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim@apache.org>
Date: Thu, 1 May 2008 17:43:59 +0000
Subject: Turn auth back on by default for c++ broker (only if SASL libs are
 available)

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@652591 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/examples/verify_all        | 2 +-
 cpp/src/qpid/broker/Broker.cpp | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/cpp/examples/verify_all b/cpp/examples/verify_all
index f5e6aed3ea..427a46f5be 100755
--- a/cpp/examples/verify_all
+++ b/cpp/examples/verify_all
@@ -8,7 +8,7 @@ qpidd=../src/qpidd
 python=$srcdir/python
  
 trap "$qpidd -q" exit
-export QPID_PORT=`$qpidd -dp0 --data-dir ""`
+export QPID_PORT=`$qpidd -dp0 --data-dir "" --auth no`
 export PYTHON_EXAMPLES=$python/examples
 export PYTHONPATH=$python:$PYTHONPATH
 export AMQP_SPEC=$srcdir/specs/amqp.0-10.xml
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index d9cf93f766..4917502fdf 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -81,11 +81,7 @@ Broker::Options::Options(const std::string& name) :
     enableMgmt(1),
     mgmtPubInterval(10),
 #if HAVE_SASL
-    //Authentication disabled by default for now to allow any
-    //scripts etc that might fail authentication to be updated.
-    //Note that this is a temporary measure (GS 14-APR-2008).
-    auth(false),
-    //auth(true),
+    auth(true),
 #else
     auth(false),
 #endif
-- 
cgit v1.2.1