--- tests/scripts/test010-passwd	2000/10/11 02:36:34	1.1.2.4
+++ tests/scripts/test010-passwd	2000/07/04 20:11:12	1.2
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $OpenLDAP: pkg/ldap/tests/scripts/test010-passwd,v 1.1.2.3 2000/09/07 00:11:26 kurt Exp $
+# $OpenLDAP: pkg/ldap/tests/scripts/test010-passwd,v 1.1 1999/12/12 17:45:07 kdz Exp $
 
 if test $# -eq 0 ; then
 	SRCDIR="."
@@ -56,7 +56,7 @@ echo "Using ldappasswd (PASS 1)  ..."
 echo "Pass 1" >> $TESTOUT
 $LDAPPASSWD -h localhost -p $PORT \
 	-w secret -s newsecret \
-	-D "cn=md5, $BASEDN" >> $TESTOUT 2>&1
+	"cn=md5, $BASEDN" >> $TESTOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
 	echo "ldappasswd failed ($RC)!"
@@ -64,8 +64,8 @@ if test $RC != 0 ; then
 	exit $RC
 fi
 $LDAPPASSWD -h localhost -p $PORT \
-	-w $PASSWD -s newsecret \
-	-D $MANAGERDN "cn=smd5, $BASEDN" >> $TESTOUT 2>&1
+	-w secret -s newsecret \
+	"cn=smd5, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then
 	echo "ldappasswd failed ($RC)!"
 	kill -HUP $PID
@@ -73,7 +73,7 @@ if test $RC != 0 ; then
 fi
 $LDAPPASSWD -h localhost -p $PORT \
 	-w secret -s newsecret \
-	-D "cn=sha, $BASEDN" >> $TESTOUT 2>&1
+	"cn=sha, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then
 	echo "ldappasswd failed ($RC)!"
 	kill -HUP $PID
@@ -81,7 +81,7 @@ if test $RC != 0 ; then
 fi
 $LDAPPASSWD -h localhost -p $PORT \
 	-w secret -s newsecret \
-	-D "cn=ssha, $BASEDN" >> $TESTOUT 2>&1
+	"cn=ssha, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then
 	echo "ldappasswd failed ($RC)!"
 	kill -HUP $PID
@@ -93,7 +93,7 @@ echo "Pass 2" >> $TESTOUT
 echo "Using ldappasswd (PASS 2)  ..."
 $LDAPPASSWD -h localhost -p $PORT \
 	-w newsecret \
-	-D "cn=md5, $BASEDN" >> $TESTOUT 2>&1
+	"cn=md5, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then
 	echo "ldappasswd failed ($RC)!"
 	kill -HUP $PID
@@ -101,7 +101,7 @@ if test $RC != 0 ; then
 fi
 $LDAPPASSWD -h localhost -p $PORT \
 	-w newsecret \
-	-D "cn=smd5, $BASEDN" >> $TESTOUT 2>&1
+	"cn=smd5, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then
 	echo "ldappasswd failed ($RC)!"
 	kill -HUP $PID
@@ -109,7 +109,7 @@ if test $RC != 0 ; then
 fi
 $LDAPPASSWD -h localhost -p $PORT \
 	-w newsecret \
-	-D "cn=sha, $BASEDN" >> $TESTOUT 2>&1
+	"cn=sha, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then
 	echo "ldappasswd failed ($RC)!"
 	kill -HUP $PID
@@ -117,7 +117,7 @@ if test $RC != 0 ; then
 fi
 $LDAPPASSWD -h localhost -p $PORT \
 	-w newsecret \
-	-D "cn=ssha, $BASEDN" >> $TESTOUT 2>&1
+	"cn=ssha, $BASEDN" >> $TESTOUT 2>&1
 if test $RC != 0 ; then
 	echo "ldappasswd failed ($RC)!"
 	kill -HUP $PID