X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest010-passwd;h=636d0cece464fa8ec3587c02e514a5f44e35689b;hb=3cb9d64de3d2fe9d0e80a9a631335b909f7b64b4;hp=8492d96ee621aa39180f6917494f4b2bcff0aced;hpb=3770a991787e93688a4119fd5e803c85d2a80845;p=openldap
diff --git a/tests/scripts/test010-passwd b/tests/scripts/test010-passwd
index 8492d96ee6..636d0cece4 100755
--- a/tests/scripts/test010-passwd
+++ b/tests/scripts/test010-passwd
@@ -1,53 +1,52 @@
#! /bin/sh
# $OpenLDAP$
-
-SRCDIR="."
-if test $# -ge 1 ; then
- SRCDIR=$1; shift
-fi
-BACKEND=bdb
-if test $# -ge 1 ; then
- BACKEND=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
- WAIT=1; shift
-fi
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2005 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
echo "running defines.sh"
. $SRCDIR/scripts/defines.sh
-echo "Cleaning up in $DBDIR..."
-
-rm -f $DBDIR/[!C]*
+mkdir -p $TESTDIR $DBDIR1
-echo "Starting slapd on TCP/IP port $PORT..."
-. $CONFFILTER $BACKEND < $PWCONF > $DBCONF
-$SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
+echo "Starting slapd on TCP/IP port $PORT1..."
+. $CONFFILTER $BACKEND $MONITORDB < $PWCONF > $CONF1
+$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
PID=$!
if test $WAIT != 0 ; then
echo PID $PID
read foo
fi
+KILLPIDS="$PID"
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 $PORT \
+ $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
'objectclass=*' > /dev/null 2>&1
RC=$?
- if test $RC = 1 ; then
- echo "Waiting 5 seconds for slapd to start..."
- sleep 5
+ if test $RC = 0 ; then
+ break
fi
+ echo "Waiting 5 seconds for slapd to start..."
+ sleep 5
done
echo "Using ldapadd to populate the database..."
-$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD < \
+$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \
$LDIFPASSWD > $TESTOUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldapadd failed ($RC)!"
- kill -HUP $PID
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
@@ -56,85 +55,100 @@ echo > $TESTOUT
echo "Using ldapsearch to verify population ..."
echo "++ Initial search" >> $SEARCHOUT
-$LDAPSEARCH -h $LOCALHOST -p $PORT \
+$LDAPSEARCH -h $LOCALHOST -p $PORT1 \
-D "$MANAGERDN" -w $PASSWD \
-b "$BASEDN" \
'objectclass=*' >> $SEARCHOUT 2>&1
echo "Using ldappasswd (PASS 1) ..."
echo "Pass 1" >> $TESTOUT
-$LDAPPASSWD -h $LOCALHOST -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT1 \
-w secret -s newsecret \
-D "cn=md5, $BASEDN" >> $TESTOUT 2>&1
RC=$?
if test $RC != 0 ; then
echo "ldappasswd failed ($RC)!"
- kill -HUP $PID
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
-$LDAPPASSWD -h $LOCALHOST -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT1 \
-w $PASSWD -s newsecret \
- -D $MANAGERDN "cn=smd5, $BASEDN" >> $TESTOUT 2>&1
+ -D "$MANAGERDN" "cn=smd5, $BASEDN" >> $TESTOUT 2>&1
+RC=$?
if test $RC != 0 ; then
echo "ldappasswd failed ($RC)!"
- kill -HUP $PID
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
-$LDAPPASSWD -h $LOCALHOST -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT1 \
-w secret -s newsecret \
-D "cn=sha, $BASEDN" >> $TESTOUT 2>&1
+RC=$?
if test $RC != 0 ; then
echo "ldappasswd failed ($RC)!"
- kill -HUP $PID
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
-$LDAPPASSWD -h $LOCALHOST -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT1 \
-w secret -s newsecret \
-D "cn=ssha, $BASEDN" >> $TESTOUT 2>&1
+RC=$?
if test $RC != 0 ; then
echo "ldappasswd failed ($RC)!"
- kill -HUP $PID
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
echo "" >> $TESTOUT
echo "Pass 2" >> $TESTOUT
echo "Using ldappasswd (PASS 2) ..."
-$LDAPPASSWD -h $LOCALHOST -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT1 \
-w newsecret \
-D "cn=md5, $BASEDN" >> $TESTOUT 2>&1
+RC=$?
if test $RC != 0 ; then
echo "ldappasswd failed ($RC)!"
- kill -HUP $PID
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
-$LDAPPASSWD -h $LOCALHOST -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT1 \
-w newsecret \
-D "cn=smd5, $BASEDN" >> $TESTOUT 2>&1
+RC=$?
if test $RC != 0 ; then
echo "ldappasswd failed ($RC)!"
- kill -HUP $PID
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
-$LDAPPASSWD -h $LOCALHOST -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT1 \
-w newsecret \
-D "cn=sha, $BASEDN" >> $TESTOUT 2>&1
+RC=$?
if test $RC != 0 ; then
echo "ldappasswd failed ($RC)!"
- kill -HUP $PID
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
-$LDAPPASSWD -h $LOCALHOST -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT1 \
-w newsecret \
-D "cn=ssha, $BASEDN" >> $TESTOUT 2>&1
+RC=$?
if test $RC != 0 ; then
echo "ldappasswd failed ($RC)!"
- kill -HUP $PID
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit $RC
fi
-kill -HUP $PID
+echo "Logging end state with ldapsearch..."
+echo "" >> $TESTOUT
+echo "++ Initial search" >> $TESTOUT
+$LDAPSEARCH -h $LOCALHOST -p $PORT1 \
+ -D "$MANAGERDN" -w $PASSWD \
+ -b "$BASEDN" \
+ 'objectclass=*' >> $TESTOUT 2>&1
-echo ">>>>> Test succeeded"
+test $KILLSERVERS != no && kill -HUP $KILLPIDS
+
+echo ">>>>> Test succeeded"
exit 0