Commit 78cfaa3c authored by Ryan Tandy's avatar Ryan Tandy
Browse files

Fix minor issues in test077 script

parent 7dfbcfa1
...@@ -17,8 +17,8 @@ echo "running defines.sh" ...@@ -17,8 +17,8 @@ echo "running defines.sh"
. $SRCDIR/scripts/defines.sh . $SRCDIR/scripts/defines.sh
if test $WITH_SASL = no ; then if test $WITH_SASL = no ; then
echo "SASL support not available, test skipped" echo "SASL support not available, test skipped"
exit 0 exit 0
fi fi
CONFDIR=$TESTDIR/slapd.d CONFDIR=$TESTDIR/slapd.d
...@@ -66,22 +66,23 @@ echo "Starting ldap:/// slapd on TCP/IP port $PORT1 and ldaps:/// slapd on $PORT ...@@ -66,22 +66,23 @@ echo "Starting ldap:/// slapd on TCP/IP port $PORT1 and ldaps:/// slapd on $PORT
$SLAPD -F $CONFDIR -h "$URI1 $SURI2" -d $LVL $TIMING > $LOG1 2>&1 & $SLAPD -F $CONFDIR -h "$URI1 $SURI2" -d $LVL $TIMING > $LOG1 2>&1 &
PID=$! PID=$!
if test $WAIT != 0 ; then if test $WAIT != 0 ; then
echo PID $PID echo PID $PID
read foo read foo
fi fi
KILLPIDS="$PID" KILLPIDS="$PID"
sleep 1 sleep 1
echo "Using ldapsearch to check that slapd is running..."
for i in 0 1 2 3 4 5; do for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "" -H $URI1 \ $LDAPSEARCH -s base -b "" -H $URI1 \
'objectclass=*' > /dev/null 2>&1 'objectclass=*' > /dev/null 2>&1
RC=$? RC=$?
if test $RC = 0 ; then if test $RC = 0 ; then
break break
fi fi
echo "Waiting 5 seconds for slapd to start..." echo "Waiting 5 seconds for slapd to start..."
sleep 5 sleep 5
done done
if test $RC != 0 ; then if test $RC != 0 ; then
...@@ -135,7 +136,7 @@ else ...@@ -135,7 +136,7 @@ else
fi fi
if test $WITH_TLS = no ; then if test $WITH_TLS = no ; then
echo "SASL/GSSAPI: TLS support not available, skipping TLS part." echo "SASL/GSSAPI: TLS support not available, skipping TLS part."
else else
echo -n "Using ldapwhoami with SASL/GSSAPI with start-tls: " echo -n "Using ldapwhoami with SASL/GSSAPI with start-tls: "
$LDAPSASLWHOAMI -N -Y GSSAPI -H $URI1 -ZZ -o tls_reqcert=allow \ $LDAPSASLWHOAMI -N -Y GSSAPI -H $URI1 -ZZ -o tls_reqcert=allow \
...@@ -167,9 +168,9 @@ else ...@@ -167,9 +168,9 @@ else
fi fi
if test $WITH_TLS = no ; then if test $WITH_TLS = no ; then
echo "TLS support not available, skipping channel-binding test" echo "TLS support not available, skipping channel-binding test"
elif test $HAVE_SASL_GSS_CBIND = no ; then elif test $HAVE_SASL_GSS_CBIND = no ; then
echo "SASL has no channel-binding support in GSSAPI, test skipped" echo "SASL has no channel-binding support in GSSAPI, test skipped"
else else
echo "Testing SASL/GSSAPI with SASL_CBINDING..." echo "Testing SASL/GSSAPI with SASL_CBINDING..."
...@@ -194,7 +195,7 @@ EOF ...@@ -194,7 +195,7 @@ EOF
# The gnutls implementation of "tls-unique" seems broken # The gnutls implementation of "tls-unique" seems broken
if test $icb = "tls-unique" -o $acb = "tls-unique" ; then if test $icb = "tls-unique" -o $acb = "tls-unique" ; then
if test $WITH_TLS_TYPE == gnutls ; then if test $WITH_TLS_TYPE = gnutls ; then
continue continue
fi fi
fi fi
...@@ -211,7 +212,7 @@ EOF ...@@ -211,7 +212,7 @@ EOF
fi fi
echo -n "Using ldapwhoami with SASL/GSSAPI and SASL_CBINDING " echo -n "Using ldapwhoami with SASL/GSSAPI and SASL_CBINDING "
echo -ne "(client: ${icb},\tserver: ${acb}): " echo -n "(client: ${icb}, server: ${acb}): "
$LDAPSASLWHOAMI -N -Y GSSAPI -H $URI1 -ZZ -o tls_reqcert=allow \ $LDAPSASLWHOAMI -N -Y GSSAPI -H $URI1 -ZZ -o tls_reqcert=allow \
-o tls_cacert=$TESTDIR/tls/ca/certs/testsuiteCA.crt \ -o tls_cacert=$TESTDIR/tls/ca/certs/testsuiteCA.crt \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment