Commit bf637ea2 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

sync with head

parent 7f09c76c
......@@ -34,10 +34,10 @@ WITHTLS=${AC_WITHTLS-yes}
ACI=${AC_ACI_ENABLED-acino}
VALSORT=${AC_valsort-valsortno}
DATADIR=./testdata
PROGDIR=./progs
TESTDIR=./testrun
SCHEMADIR=./schema
DATADIR=${USER_DATADIR-./testdata}
TESTDIR=${USER_TESTDIR-./testrun}
SCHEMADIR=${USER_SCHEMADIR-./schema}
DBDIR1A=$TESTDIR/db.1.a
DBDIR1B=$TESTDIR/db.1.b
......
......@@ -26,6 +26,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to check that slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
......
......@@ -28,6 +28,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to retrieve the root DSE..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -b "" -s base -h $LOCALHOST -p $PORT1 \
......
......@@ -37,6 +37,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to retrieve all the entries..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
......
......@@ -28,6 +28,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to check that slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
......
......@@ -45,6 +45,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Testing slapd searching..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
......
......@@ -36,6 +36,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Testing slapd modify operations..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
......
......@@ -36,6 +36,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Testing slapd modrdn operations..."
# Make sure we can search the database
......
......@@ -44,6 +44,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Testing slapd access control..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
......
......@@ -55,6 +55,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$KILLPIDS $SLAVEPID"
sleep 1
echo "Using ldapsearch to check that master slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
......@@ -252,6 +254,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$KILLPIDS $SLAVEPID"
sleep 1
echo "Using ldapsearch to check that slave slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \
......@@ -277,9 +281,10 @@ KILLPIDS="$KILLPIDS $SLURPPID"
echo "Waiting 15 seconds for slurpd to send changes..."
sleep 15
echo "Try updating the slave slapd..."
$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT2 -w $PASSWD > \
$TESTOUT 2>&1 << EOMODS
if test ! $BACKLDAP = "ldapno" ; then
echo "Try updating the slave slapd..."
$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT2 -w $PASSWD > \
$TESTOUT 2>&1 << EOMODS
dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com
changetype: modify
add: description
......@@ -288,18 +293,7 @@ description: unless the chain overlay is configured appropriately ;)
EOMODS
RC=$?
if test $BACKLDAP = "ldapno" ; then
# expect 10 (LDAP_REFERRAL)...
if test $RC != 10 ; then
echo "ldapmodify should have failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
else
# expect 0 (LDAP_SUCCESS)...
RC=$?
if test $RC != 0 ; then
echo "ldapmodify failed ($RC)!"
test $KILLSERVERS != no && kill -HUP $KILLPIDS
......
......@@ -36,6 +36,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to check that slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
......@@ -49,7 +51,8 @@ for i in 0 1 2 3 4 5; do
done
echo "Using tester for concurrent server access..."
$SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l 50
time $SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l 50
#$SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l 50
RC=$?
if test $RC != 0 ; then
......
......@@ -50,6 +50,8 @@ fi
KILLPIDS="$PID $SLAVEPID"
sleep 1
echo "Testing for master slapd..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
......
......@@ -28,6 +28,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to check that slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
......
......@@ -36,6 +36,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to retrieve all the entries..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
......
......@@ -28,6 +28,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to check that slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
......
......@@ -28,6 +28,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to check that slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
......
......@@ -37,6 +37,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to check that slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
......
......@@ -45,6 +45,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Testing slapd searching..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
......
......@@ -38,6 +38,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Testing slapd searching..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
......
......@@ -43,6 +43,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
sleep 1
echo "Using ldapsearch to check that master slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
......@@ -81,6 +83,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$KILLPIDS $SLAVEPID"
sleep 1
echo "Using ldapsearch to check that slave slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \
......
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