Rename LDIF2LDBM to SLAPADD

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index cc56ee7e75b4f96b67ac620abc307a6325b6df66..649fb30e5c2b38c2bdd552e48609fc90429997d8 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -29,7 +29,9 @@ PASSWDCONF=$DATADIR/slapd-passwd.conf
 CLIENTDIR=../clients/tools
 #CLIENTDIR=/usr/local/bin
 
-LDIF2LDBM="../servers/slapd/tools/slapadd $LDAP_VERBOSE"
+SLAPADD="../servers/slapd/tools/slapadd $LDAP_VERBOSE"
+SLAPCAT="../servers/slapd/tools/slapcat $LDAP_VERBOSE"
+SLAPINDEX="../servers/slapd/tools/slapindex $LDAP_VERBOSE"
 
 CMP="diff -i"
 CMPOUT=/dev/null

diff --git a/tests/scripts/startup_nis_ldap_server.sh b/tests/scripts/startup_nis_ldap_server.sh
index 442c62fa1cac5dbf2b3eba287108ae05cdb673bc..da66c86d128dc4f7afba6ee2c6cd4b427cdd0517 100755 (executable)
--- a/tests/scripts/startup_nis_ldap_server.sh
+++ b/tests/scripts/startup_nis_ldap_server.sh
@@ -27,7 +27,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
-$LDIF2LDBM -f $NIS_CONF -l $NIS_LDIF
+$SLAPADD -f $NIS_CONF -l $NIS_LDIF
 RC=$?
 if [ $RC != 0 ]; then
        echo "slapadd failed!"

diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index 628a7f7c3463d4eaed8fd1603eba8c8d753fb0dd..6cada5e4320810cf603e0484636efdcabf4b0b67 100755 (executable)
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -21,7 +21,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
-$LDIF2LDBM -f $CONF -l $LDIF
+$SLAPADD -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
        echo "slapadd failed ($RC)!"

diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index 8d536378cbe8fd51bd6738efdbc18afa44487149..5b82c32c0d12368d9e072e1e3e993d7ccac99d6f 100755 (executable)
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -18,7 +18,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
-$LDIF2LDBM -f $CONF -l $LDIF
+$SLAPADD -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
        echo "slapadd failed ($RC)!"

diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 73fb373f5f3847d17489d6bca24e3adcd056bde9..6bd4e9e7d4b3cd210ed76ba3c8462fe00ab3ebf0 100755 (executable)
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -18,7 +18,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
-$LDIF2LDBM -f $CONF -l $LDIF
+$SLAPADD -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
        echo "slapadd failed ($RC)!"

diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index 00c0705188cbad498a716055705ad487148ce08c..9029a1c2976d654642426e46ae69af14b3cf4fda 100755 (executable)
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -18,7 +18,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
-$LDIF2LDBM -f $CONF -l $LDIF
+$SLAPADD -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
        echo "slapadd failed ($RC)!"

diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index ea756a2cdf00a469e5a1c2778a88c52f6c89686b..6c0b1a0dcdf498bed35fb0364347d068f4f4ad33 100755 (executable)
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -18,7 +18,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
-$LDIF2LDBM -f $CONF -l $LDIF
+$SLAPADD -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
        echo "slapadd failed ($RC)!"

diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index bfaacb9e77e6411ca859a8338622c998f711ceda..ec93723ad2a0de83061b93b401a5580198add368 100755 (executable)
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -21,7 +21,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
-$LDIF2LDBM -f $CONF -l $LDIF
+$SLAPADD -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
        echo "slapadd failed ($RC)!"

diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral
index b2cb1782885f1304c70432caec1b62ff0037b073..e6f650a266d09789e7a6f43ef0b1a4096c6952d5 100755 (executable)
--- a/tests/scripts/test009-referral
+++ b/tests/scripts/test009-referral
@@ -23,7 +23,7 @@ rm -f $DBDIR/[!C]*
 rm -f $REPLDIR/[!C]*
 
 echo "Running slapadd to build slapd database..."
-$LDIF2LDBM -f $CONF -l $LDIF
+$SLAPADD -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
        echo "slapadd failed ($RC)!"