From: Kurt Zeilenga <kurt@openldap.org>
Date: Sun, 22 Aug 1999 17:10:23 +0000 (+0000)
Subject: s/ldif2ldbm/slapadd/
X-Git-Tag: TWEB_OL_BASE~126
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=59d3e50ae373ec0c5d7fd1e2d0ef7ec5cb345d02;p=openldap

s/ldif2ldbm/slapadd/
---

diff --git a/tests/scripts/makeldbm.sh b/tests/scripts/makeldbm.sh
index 4107012e97..06a3d4f3f3 100755
--- a/tests/scripts/makeldbm.sh
+++ b/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
diff --git a/tests/scripts/startup_nis_ldap_server.sh b/tests/scripts/startup_nis_ldap_server.sh
index 06391bb48c..f2bf201747 100755
--- a/tests/scripts/startup_nis_ldap_server.sh
+++ b/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
 
diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index 8fde6c4131..fd59120f55 100755
--- a/tests/scripts/test001-slapadd
+++ b/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
 
diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index de58905d9e..d75319c09c 100755
--- a/tests/scripts/test003-search
+++ b/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
 
diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index c9fbd09029..05b5fe432e 100755
--- a/tests/scripts/test004-modify
+++ b/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
 
diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index caf0df4f8a..107d602b8b 100755
--- a/tests/scripts/test005-modrdn
+++ b/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
 
diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index ad866b7f1a..6193e515c0 100755
--- a/tests/scripts/test006-acls
+++ b/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
 
diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index 9644566ee7..a7811adcf2 100755
--- a/tests/scripts/test008-concurrency
+++ b/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..."
diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral
index 3bc69ea74f..cda35c3c91 100755
--- a/tests/scripts/test009-referral
+++ b/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