s/ldif2ldbm/slapadd/

tests/scripts/makeldbm.sh

@@ -6,10 +6,10 @@ echo "Cleaning up in $DBDIR..."
 
 rm -f $DBDIR/[!C]*
 
-echo "Running ldif2ldbm to build slapd database..."
-$LDIF2LDBM -f $CONF -l $LDIF
+echo "Running slapadd to build slapd database..."
+$slapadd -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
-	echo "ldif2ldbm failed!"
+	echo "slapadd failed!"
 	exit $RC
 fi

tests/scripts/startup_nis_ldap_server.sh

@@ -26,11 +26,11 @@ echo "Cleaning up in $DBDIR..."
 
 rm -f $DBDIR/[!C]*
 
-echo "Running ldif2ldbm to build slapd database..."
+echo "Running slapadd to build slapd database..."
 $LDIF2LDBM -f $NIS_CONF -l $NIS_LDIF
 RC=$?
 if [ $RC != 0 ]; then
-	echo "ldif2ldbm failed!"
+	echo "slapadd failed!"
 	exit $RC
 fi
 

tests/scripts/test001-slapadd

@@ -19,11 +19,11 @@ echo "Cleaning up in $DBDIR..."
 
 rm -f $DBDIR/[!C]*
 
-echo "Running ldif2ldbm to build slapd database..."
+echo "Running slapadd to build slapd database..."
 $LDIF2LDBM -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
-	echo "ldif2ldbm failed!"
+	echo "slapadd failed!"
 	exit $RC
 fi
 

tests/scripts/test003-search

@@ -16,11 +16,11 @@ echo "Cleaning up in $DBDIR..."
 
 rm -f $DBDIR/[!C]*
 
-echo "Running ldif2ldbm to build slapd database..."
+echo "Running slapadd to build slapd database..."
 $LDIF2LDBM -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
-	echo "ldif2ldbm failed!"
+	echo "slapadd failed!"
 	exit $RC
 fi
 

tests/scripts/test004-modify

@@ -16,11 +16,11 @@ echo "Cleaning up in $DBDIR..."
 
 rm -f $DBDIR/[!C]*
 
-echo "Running ldif2ldbm to build slapd database..."
+echo "Running slapadd to build slapd database..."
 $LDIF2LDBM -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
-	echo "ldif2ldbm failed!"
+	echo "slapadd failed!"
 	exit $RC
 fi
 

tests/scripts/test005-modrdn

@@ -16,11 +16,11 @@ echo "Cleaning up in $DBDIR..."
 
 rm -f $DBDIR/[!C]*
 
-echo "Running ldif2ldbm to build slapd database..."
+echo "Running slapadd to build slapd database..."
 $LDIF2LDBM -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
-	echo "ldif2ldbm failed!"
+	echo "slapadd failed!"
 	exit $RC
 fi
 

tests/scripts/test006-acls

@@ -16,11 +16,11 @@ echo "Cleaning up in $DBDIR..."
 
 rm -f $DBDIR/[!C]*
 
-echo "Running ldif2ldbm to build slapd database..."
+echo "Running slapadd to build slapd database..."
 $LDIF2LDBM -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
-	echo "ldif2ldbm failed!"
+	echo "slapadd failed!"
 	exit $RC
 fi
 

tests/scripts/test008-concurrency

@@ -19,15 +19,15 @@ echo "Cleaning up in $DBDIR..."
 
 rm -f $DBDIR/[!C]*
 
-echo "Running ldif2ldbm to build slapd database..."
+echo "Running slapadd to build slapd database..."
 $LDIF2LDBM -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
-	echo "ldif2ldbm failed!"
+	echo "slapadd failed!"
 	exit $RC
 fi
 
-echo "Waiting 5 seconds for ldif2ldbm to build slapd database..."
+echo "Waiting 5 seconds for slapadd to build slapd database..."
 sleep 5
 
 echo "Starting slapd on TCP/IP port $PORT..."

tests/scripts/test009-referral

@@ -21,11 +21,11 @@ echo "Cleaning up in $DBDIR and $REPLDIR ..."
 rm -f $DBDIR/[!C]*
 rm -f $REPLDIR/[!C]*
 
-echo "Running ldif2ldbm to build slapd database..."
+echo "Running slapadd to build slapd database..."
 $LDIF2LDBM -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
-	echo "ldif2ldbm failed!"
+	echo "slapadd failed!"
 	exit $RC
 fi