s/ldif2ldbm/slapadd/

diff --git a/tests/scripts/makeldbm.sh b/tests/scripts/makeldbm.sh
index 4107012e97a7f3c99de5a619faa4bfa566773844..06a3d4f3f393632a6c434ffca5c23c09b53cc511 100755 (executable)
--- 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 06391bb48cecb55b5d3ed21bc70f0a0ff7ffa823..f2bf20174754bcf548499f1989e9f0bb8b89f83c 100755 (executable)
--- 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 8fde6c413103cfa405cc627550dfc9afdf7f6d91..fd59120f5543385f5b7165a623cd25204df52711 100755 (executable)
--- 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 de58905d9e252425b5229ac32cd68e918bf3d030..d75319c09c464354cb1b030c9580cc49cef2b418 100755 (executable)
--- 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 c9fbd0902911656b562b31eb14f43a093f519613..05b5fe432e004c73b66301fea3efff319dcaafdc 100755 (executable)
--- 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 caf0df4f8a57380dfd6b91fb357c22e869b13484..107d602b8b07bc0b7f7e195e7c3b2d9585604246 100755 (executable)
--- 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 ad866b7f1aa5f4b4ed3d8aa9e28a9a590927efd4..6193e515c0c1bd87860d2eebbe0dcb310a453733 100755 (executable)
--- 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 9644566ee760fa761a6032d39985c8228a0c4e23..a7811adcf29c0df818930c97aab888eb1d3fc78b 100755 (executable)
--- 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 3bc69ea74fd76e13306f8f4edc561fc0a3bf9e30..cda35c3c91d581a3276e185dfebb5d17f53ee701 100755 (executable)
--- 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