diff options
| author | Gordon Sim <gsim@apache.org> | 2008-04-14 09:54:16 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2008-04-14 09:54:16 +0000 |
| commit | f58096364147d54676f520efc003c58fa7897d0f (patch) | |
| tree | 2e1954201b139d6cca7beae9f703a46be2cda922 /cpp/src/tests | |
| parent | 1bf367821416484ebbb14480a5b68d1e6110b4c9 (diff) | |
| download | qpid-python-f58096364147d54676f520efc003c58fa7897d0f.tar.gz | |
QPID-648: Initial support for sasl authentication for c++ broker. From patch submitted by mfarrellee@redhat.com.
Authentication is optional at compile time (based on user selection or availability of cyrus sasl libs) and at
runtime (through broker config option). Note: At present the runtime default is to not authenticate; this is a
temporary measure to give some time for any automation scripts etc to be updated and will revert shortly to be
on by default.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@647716 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/BrokerFixture.h | 1 | ||||
| -rwxr-xr-x | cpp/src/tests/run_federation_tests | 4 | ||||
| -rwxr-xr-x | cpp/src/tests/start_broker | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/tests/BrokerFixture.h b/cpp/src/tests/BrokerFixture.h index fd350b77fe..83b3f621c7 100644 --- a/cpp/src/tests/BrokerFixture.h +++ b/cpp/src/tests/BrokerFixture.h @@ -47,6 +47,7 @@ struct BrokerFixture { opts.enableMgmt=false; opts.workerThreads=1; opts.dataDir=""; + opts.auth=false; broker = Broker::create(opts); // TODO aconway 2007-12-05: At one point BrokerFixture // tests could hang in Connection ctor if the following diff --git a/cpp/src/tests/run_federation_tests b/cpp/src/tests/run_federation_tests index 63f0baa1ae..1f5917af0e 100755 --- a/cpp/src/tests/run_federation_tests +++ b/cpp/src/tests/run_federation_tests @@ -4,9 +4,9 @@ trap stop_brokers EXIT start_brokers() { - ../qpidd --daemon --port 0 --no-data-dir > qpidd.port + ../qpidd --daemon --port 0 --no-data-dir --auth no > qpidd.port LOCAL_PORT=`cat qpidd.port` - ../qpidd --daemon --port 0 --no-data-dir > qpidd.port + ../qpidd --daemon --port 0 --no-data-dir --auth no > qpidd.port REMOTE_PORT=`cat qpidd.port` } diff --git a/cpp/src/tests/start_broker b/cpp/src/tests/start_broker index 0d4352644b..7d5cb7d73d 100755 --- a/cpp/src/tests/start_broker +++ b/cpp/src/tests/start_broker @@ -1,4 +1,4 @@ #!/bin/sh rm -f qpidd.vglog qpidd.log test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file-exactly=qpidd.vglog --" -exec libtool --mode=execute $VALGRIND ../qpidd --daemon --port 0 --log-output qpidd.log "$@" > qpidd.port +exec libtool --mode=execute $VALGRIND ../qpidd --auth no --daemon --port 0 --log-output qpidd.log "$@" > qpidd.port |