summaryrefslogtreecommitdiff
path: root/qpid
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2008-05-01 17:43:59 +0000
committerGordon Sim <gsim@apache.org>2008-05-01 17:43:59 +0000
commit4c985b2fee8c7fd53aea38aea201e03f548cd329 (patch)
treec10f083a36ee119c6a8fd742a4dd4eb04927837c /qpid
parent6c7fc048d974972507a2910f33a342ce5ff6013c (diff)
downloadqpid-python-4c985b2fee8c7fd53aea38aea201e03f548cd329.tar.gz
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@652591 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
-rwxr-xr-xqpid/cpp/examples/verify_all2
-rw-r--r--qpid/cpp/src/qpid/broker/Broker.cpp6
2 files changed, 2 insertions, 6 deletions
diff --git a/qpid/cpp/examples/verify_all b/qpid/cpp/examples/verify_all
index f5e6aed3ea..427a46f5be 100755
--- a/qpid/cpp/examples/verify_all
+++ b/qpid/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/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp
index d9cf93f766..4917502fdf 100644
--- a/qpid/cpp/src/qpid/broker/Broker.cpp
+++ b/qpid/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