X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fscripts%2Ftest010-passwd;h=2dd82b89f3098602b05a74641857d374fcf1c0de;hb=c8c34cdd43d3603f3b64a56841b4425379c98f45;hp=7c8c12c2360c4f4b4416c096c116110e4a4ef305;hpb=daacf23672ce3cf0d98f8c18e0fa2f017746c213;p=openldap
diff --git a/tests/scripts/test010-passwd b/tests/scripts/test010-passwd
index 7c8c12c236..2dd82b89f3 100755
--- a/tests/scripts/test010-passwd
+++ b/tests/scripts/test010-passwd
@@ -1,44 +1,54 @@
#! /bin/sh
# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2011 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
+## .
-if test $# -eq 0 ; then
- SRCDIR="."
-else
- SRCDIR=$1; shift
-fi
-if test $# -eq 1 ; then
- BACKEND=$1; shift
-fi
-
-echo "running defines.sh $SRCDIR $BACKEND"
+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..."
-$SLAPD -f $PWCONF -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"
+
+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 $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
@@ -47,85 +57,133 @@ 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 to test a few error conditions ..."
+echo "Pass 0" >> $TESTOUT
+$LDAPPASSWD -h $LOCALHOST -p $PORT1 \
+ -w secret -a "" -s newsecret \
+ -D "cn=md5, $BASEDN" >> $TESTOUT 2>&1
+RC=$?
+if test $RC = 0 ; then
+ echo "ldappasswd unexpectantly passed ($RC)! old empty"
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
+ exit 1
+fi
+$LDAPPASSWD -h $LOCALHOST -p $PORT1 \
+ -w secret -a oldsecret -s "" \
+ -D "cn=md5, $BASEDN" >> $TESTOUT 2>&1
+RC=$?
+if test $RC = 0 ; then
+ echo "ldappasswd unexpectantly passed ($RC)! new empty"
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
+ exit 1
+fi
+$LDAPPASSWD -h $LOCALHOST -p $PORT1 \
+ -w secret -a oldsecret -s newsecret \
+ -D "cn=md5, $BASEDN" >> $TESTOUT 2>&1
+RC=$?
+if test $RC = 0 ; then
+ echo "ldappasswd unexpectantly passed ($RC)! wrong old"
+ test $KILLSERVERS != no && kill -HUP $KILLPIDS
+ exit 1
+fi
+
echo "Using ldappasswd (PASS 1) ..."
echo "Pass 1" >> $TESTOUT
-$LDAPPASSWD -h localhost -p $PORT \
+$LDAPPASSWD -h $LOCALHOST -p $PORT1 \
-w secret -s newsecret \
- "cn=md5, $BASEDN" >> $TESTOUT 2>&1
+ -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 \
- -w secret -s newsecret \
- "cn=smd5, $BASEDN" >> $TESTOUT 2>&1
+$LDAPPASSWD -h $LOCALHOST -p $PORT1 \
+ -w $PASSWD -s newsecret \
+ -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 \
- "cn=sha, $BASEDN" >> $TESTOUT 2>&1
+ -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 \
- "cn=ssha, $BASEDN" >> $TESTOUT 2>&1
+ -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 \
- "cn=md5, $BASEDN" >> $TESTOUT 2>&1
+ -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 \
- "cn=smd5, $BASEDN" >> $TESTOUT 2>&1
+ -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 \
- "cn=sha, $BASEDN" >> $TESTOUT 2>&1
+ -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 \
- "cn=ssha, $BASEDN" >> $TESTOUT 2>&1
+ -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 "++ End search" >> $TESTOUT
+$LDAPSEARCH -h $LOCALHOST -p $PORT1 \
+ -D "$MANAGERDN" -w $PASSWD \
+ -b "$BASEDN" \
+ 'objectclass=*' >> $TESTOUT 2>&1
+
+
+test $KILLSERVERS != no && kill -HUP $KILLPIDS
echo ">>>>> Test succeeded"
+test $KILLSERVERS != no && wait
+
exit 0