ITS#3671 must release conn->c_mutex to allow blocked writers to exit

[openldap] / tests / scripts / relay

diff --git a/tests/scripts/relay b/tests/scripts/relay
index befaee6cff95406ebf16d00a3464b2314e963efa..638d330b77d78c71b3a21bad0da632e2303e1407 100755 (executable)
--- a/tests/scripts/relay
+++ b/tests/scripts/relay
@@ -17,7 +17,7 @@ echo "Using $RELAY backend..."
 echo ""
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-. $CONFFILTER $BACKEND $MONITORDB < $RWMCONF > $CONF1
+. $CONFFILTER $BACKEND $MONITORDB < $RELAYCONF > $CONF1
 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
@@ -38,7 +38,7 @@ for i in 0 1 2 3 4 5; do
        sleep 5
 done
 if test $RC != 0 ; then
-       echo "ldapsearch failed $(RC)!"
+       echo "ldapsearch failed ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit $RC
 fi
@@ -308,7 +308,22 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-BASEDN="o=Example,c=US"
+FILTER="(uid=example)"
+echo "Searching filter=\"$FILTER\""
+echo " attrs=\"uid\""
+echo " base=\"$BASEDN\"..."
+echo "# searching filter=\"$FILTER\"" >> $SEARCHOUT
+echo "#        attrs=\"uid\"" >> $SEARCHOUT
+echo "#        base=\"$BASEDN\"..." >> $SEARCHOUT
+$LDAPSEARCH -h $LOCALHOST -p $PORT1 -b "$BASEDN" "$FILTER" uid \
+       >> $SEARCHOUT 2>&1
+RC=$?
+if test $RC != 0 ; then
+       echo "Search failed ($RC)!"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       exit $RC
+fi
+
 FILTER="(member=cn=Another Added Group,ou=Groups,$BASEDN)"
 echo "Searching filter=\"$FILTER\""
 echo " attrs=\"member\""