diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Makefile.am | 2 | ||||
| -rw-r--r-- | cpp/src/sasl.mk | 31 | ||||
| -rwxr-xr-x | cpp/src/tests/run_cluster_authentication_soak | 12 | ||||
| -rwxr-xr-x | cpp/src/tests/run_cluster_authentication_test | 12 |
4 files changed, 24 insertions, 33 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index f3f8ac5f1c..15a0eb448a 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -489,8 +489,6 @@ if HAVE_SASL libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.h libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.cpp libqpidcommon_la_LIBADD += -lsasl2 - -include sasl.mk endif libqpidbroker_la_LIBADD = libqpidcommon.la -luuid diff --git a/cpp/src/sasl.mk b/cpp/src/sasl.mk deleted file mode 100644 index fd788e3968..0000000000 --- a/cpp/src/sasl.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -SASLTEST_DIR = $(top_srcdir)/src/tests/sasl_config -SASLTEST_CONF = $(SASLTEST_DIR)/qpidd.conf -SASLTEST_DB = $(SASLTEST_DIR)/qpidd.sasldb - -$(SASLTEST_DB): - echo zig | $(SASL_PASSWD) -c -p -f $(SASLTEST_DB) -u QPID zig - echo zag | $(SASL_PASSWD) -c -p -f $(SASLTEST_DB) -u QPID zag - -sasltestdbdir = $(SASLTEST_DIR) -sasltestdb_DATA = $(SASLTEST_DB) - -CLEANFILES=$(SASLTEST_DB) - diff --git a/cpp/src/tests/run_cluster_authentication_soak b/cpp/src/tests/run_cluster_authentication_soak index d0a9059097..2bb7a833f6 100755 --- a/cpp/src/tests/run_cluster_authentication_soak +++ b/cpp/src/tests/run_cluster_authentication_soak @@ -1,4 +1,16 @@ #! /bin/bash +SASL_PW=/usr/sbin/saslpasswd2 +SASLTEST_DB=./sasl_config/qpidd.sasldb + +if [ -e $SASL_PW ] +then + echo "Building temporary sasl db." + rm -f $SASLTEST_DB + echo zig | $SASL_PW -c -p -f $SASLTEST_DB -u QPID zig + echo zag | $SASL_PW -c -p -f $SASLTEST_DB -u QPID zag +fi + +# This test will return something reasonable whether or not sasl exists. ./cluster_authentication_soak 500 diff --git a/cpp/src/tests/run_cluster_authentication_test b/cpp/src/tests/run_cluster_authentication_test index 5e71baf2e5..15597e7073 100755 --- a/cpp/src/tests/run_cluster_authentication_test +++ b/cpp/src/tests/run_cluster_authentication_test @@ -1,4 +1,16 @@ #! /bin/bash +SASL_PW=/usr/sbin/saslpasswd2 +SASLTEST_DB=./sasl_config/qpidd.sasldb + +if [ -e $SASL_PW ] +then + echo "Building temporary sasl db." + rm -f $SASLTEST_DB + echo zig | $SASL_PW -c -p -f $SASLTEST_DB -u QPID zig + echo zag | $SASL_PW -c -p -f $SASLTEST_DB -u QPID zag +fi + +# This test will return something reasonable whether or not sasl exists. ./cluster_authentication_soak |