From 94193358b46351bc5ee4c7660c1f9b4ded638da8 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 15 Jan 2002 17:26:44 +0000 Subject: [PATCH] Switch the default backend to BDB. --- configure | 14 +++++++------- configure.in | 8 ++++---- tests/Makefile.in | 2 +- tests/scripts/all | 2 +- tests/scripts/defines.sh | 16 +++++++++------- tests/scripts/start-master | 2 +- tests/scripts/start-master-nolog | 2 +- tests/scripts/test000-rootdse | 2 +- tests/scripts/test001-slapadd | 4 ++-- tests/scripts/test002-populate | 2 +- tests/scripts/test003-search | 2 +- tests/scripts/test004-modify | 2 +- tests/scripts/test005-modrdn | 2 +- tests/scripts/test006-acls | 2 +- tests/scripts/test007-replication | 2 +- tests/scripts/test008-concurrency | 2 +- tests/scripts/test009-referral | 2 +- tests/scripts/test010-passwd | 2 +- tests/scripts/test011-subtree-repl | 2 +- tests/scripts/test012-glue | 2 +- 20 files changed, 38 insertions(+), 36 deletions(-) diff --git a/configure b/configure index 4e1bcba4ce..86526947cf 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # $OpenLDAP$ -# from OpenLDAP: pkg/ldap/configure.in,v 1.387 2002/01/03 15:24:54 hyc Exp +# from OpenLDAP: pkg/ldap/configure.in,v 1.388 2002/01/04 20:17:28 kurt Exp # Copyright 1998-2002 The OpenLDAP Foundation. All Rights Reserved. # @@ -90,7 +90,7 @@ ac_help="$ac_help ac_help="$ac_help --enable-wrappers enable tcp wrapper support [no]" ac_help="$ac_help - --enable-bdb enable Berkeley DB backend [no]" + --enable-bdb enable Berkeley DB backend [yes]" ac_help="$ac_help --with-bdb-module module type [static]" ac_help="$ac_help @@ -102,7 +102,7 @@ ac_help="$ac_help ac_help="$ac_help --with-ldap-module module type [static]" ac_help="$ac_help - --enable-ldbm enable ldbm backend [yes]" + --enable-ldbm enable ldbm backend [no]" ac_help="$ac_help --with-ldbm-api with LDBM API [auto]" ac_help="$ac_help @@ -1844,7 +1844,7 @@ if test "${enable_bdb+set}" = set; then ol_enable_bdb="$ol_arg" else - ol_enable_bdb="no" + ol_enable_bdb="yes" fi # end --enable-bdb # OpenLDAP --with-bdb_module @@ -1967,7 +1967,7 @@ if test "${enable_ldbm+set}" = set; then ol_enable_ldbm="$ol_arg" else - ol_enable_ldbm="yes" + ol_enable_ldbm="no" fi # end --enable-ldbm # OpenLDAP --with-ldbm_api @@ -14037,8 +14037,8 @@ EOF fi if test $ol_enable_bdb = yes -a $ol_link_ldbm != berkeley ; then - { echo "configure: error: BerkeleyDB not availabl" 1>&2; exit 1; } -elif test $ol_enable_bdb != no -a $ol_link_ldbm != no ; then + { echo "configure: error: BerkeleyDB not available" 1>&2; exit 1; } +elif test $ol_enable_bdb != no -a $ol_link_ldbm != berkeley ; then ol_enable_bdb=yes fi diff --git a/configure.in b/configure.in index 6d9c243df4..c054de296a 100644 --- a/configure.in +++ b/configure.in @@ -164,7 +164,7 @@ OL_ARG_ENABLE(slp, [ --enable-slp enable SLPv2 support], no)dnl OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no)dnl dnl SLAPD Backend options -OL_ARG_ENABLE(bdb,[ --enable-bdb enable Berkeley DB backend], no)dnl +OL_ARG_ENABLE(bdb,[ --enable-bdb enable Berkeley DB backend], yes)dnl OL_ARG_WITH(bdb_module,[ --with-bdb-module module type], static, [static dynamic]) OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable dnssrv backend], no)dnl @@ -173,7 +173,7 @@ OL_ARG_WITH(dnssrv_module,[ --with-dnssrv-module module type], static, OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend], no)dnl OL_ARG_WITH(ldap_module,[ --with-ldap-module module type], static, [static dynamic]) -OL_ARG_ENABLE(ldbm,[ --enable-ldbm enable ldbm backend], yes)dnl +OL_ARG_ENABLE(ldbm,[ --enable-ldbm enable ldbm backend], no)dnl OL_ARG_WITH(ldbm_api,[ --with-ldbm-api with LDBM API], auto, [auto berkeley bcompat mdbm gdbm]) OL_ARG_WITH(ldbm_module,[ --with-ldbm-module module type], static, @@ -1879,8 +1879,8 @@ if test $ol_with_ldbm_api = auto \ fi if test $ol_enable_bdb = yes -a $ol_link_ldbm != berkeley ; then - AC_MSG_ERROR(BerkeleyDB not availabl) -elif test $ol_enable_bdb != no -a $ol_link_ldbm != no ; then + AC_MSG_ERROR(BerkeleyDB not available) +elif test $ol_enable_bdb != no -a $ol_link_ldbm != berkeley ; then ol_enable_bdb=yes fi diff --git a/tests/Makefile.in b/tests/Makefile.in index 9fd04e2085..d2212ab59a 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -8,7 +8,7 @@ BUILD_LDBM=@BUILD_LDBM@ BUILD_BDB=@BUILD_BDB@ test: tests -tests: ldbm +tests: bdb ldbm bdb: test-bdb test-bdb: FORCE diff --git a/tests/scripts/all b/tests/scripts/all index bbbcad5c59..6a8bff6bf8 100755 --- a/tests/scripts/all +++ b/tests/scripts/all @@ -15,7 +15,7 @@ fi echo ">>>>> Test Directory: $SRCDIR" if test $# -eq 0 ; then - BACKEND=ldbm + BACKEND=bdb else BACKEND=$1; shift fi diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh index db86834ade..96a7c13d4f 100755 --- a/tests/scripts/defines.sh +++ b/tests/scripts/defines.sh @@ -39,7 +39,9 @@ SLAPADD="../servers/slapd/tools/slapadd $LDAP_VERBOSE" SLAPCAT="../servers/slapd/tools/slapcat $LDAP_VERBOSE" SLAPINDEX="../servers/slapd/tools/slapindex $LDAP_VERBOSE" -CMP="diff -i" +unset DIFF_OPTIONS +DIFF="diff -iu" +CMP="diff -ic" CMPOUT=/dev/null SLAPD="../servers/slapd/slapd -s0" SLURPD=../servers/slurpd/slurpd @@ -62,13 +64,13 @@ LDIFBASE=$DATADIR/test-base.ldif LDIFPASSWD=$DATADIR/passwd.ldif LDIFPASSWDOUT=$DATADIR/passwd-out.ldif MONITOR="" -BASEDN="o=University of Michigan, c=US" -MANAGERDN="cn=Manager, o=University of Michigan, c=US" -UPDATEDN="cn=Replica, o=University of Michigan, c=US" +BASEDN="o=University of Michigan,c=US" +MANAGERDN="cn=Manager,o=University of Michigan,c=US" +UPDATEDN="cn=Replica,o=University of Michigan,c=US" PASSWD=secret -BABSDN="cn=Barbara Jensen, ou=Information Technology Division, ou=People, o=University of Michigan , c = US " -BJORNSDN="cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US" -JAJDN="cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US" +BABSDN="cn=Barbara Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US" +BJORNSDN="cn=Bjorn Jensen,ou=Information Technology Division,ou=People,o=University of Michigan,c=US" +JAJDN="cn=James A Jones 1,ou=Alumni Association,ou=People,o=University of Michigan,c=US" MASTERLOG=$DBDIR/master.log SLAVELOG=$DBDIR/slave.log SLURPLOG=$DBDIR/slurp.log diff --git a/tests/scripts/start-master b/tests/scripts/start-master index cbea4a2f6a..f527c432b8 100755 --- a/tests/scripts/start-master +++ b/tests/scripts/start-master @@ -5,7 +5,7 @@ SRCDIR="." if test $# -ge 1 ; then SRCDIR=$1; shift fi -BACKEND=ldbm +BACKEND=bdb if test $# -ge 1 ; then BACKEND=$1; shift fi diff --git a/tests/scripts/start-master-nolog b/tests/scripts/start-master-nolog index b075c38f77..6055321607 100755 --- a/tests/scripts/start-master-nolog +++ b/tests/scripts/start-master-nolog @@ -5,7 +5,7 @@ SRCDIR="." if test $# -ge 1 ; then SRCDIR=$1; shift fi -BACKEND=ldbm +BACKEND=bdb if test $# -ge 1 ; then BACKEND=$1; shift fi diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse index a69fa8092d..205c1b5440 100755 --- a/tests/scripts/test000-rootdse +++ b/tests/scripts/test000-rootdse @@ -5,7 +5,7 @@ SRCDIR="." if test $# -ge 1 ; then SRCDIR=$1; shift fi -BACKEND=ldbm +BACKEND=bdb if test $# -ge 1 ; then BACKEND=$1; shift fi diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd index 9d3af2d827..a839be1c4f 100755 --- a/tests/scripts/test001-slapadd +++ b/tests/scripts/test001-slapadd @@ -5,7 +5,7 @@ SRCDIR="." if test $# -ge 1 ; then SRCDIR=$1; shift fi -BACKEND=ldbm +BACKEND=bdb if test $# -ge 1 ; then BACKEND=$1; shift fi @@ -68,7 +68,7 @@ $CMP $SEARCHFLT $LDIFFLT > $CMPOUT if test $? != 0 ; then echo "comparison failed - database was not created correctly" echo $SEARCHFLT $LDIFFLT - diff -iu $SEARCHFLT $LDIFFLT + $DIFF $SEARCHFLT $LDIFFLT exit 1 fi diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate index d069e07536..9318b65205 100755 --- a/tests/scripts/test002-populate +++ b/tests/scripts/test002-populate @@ -5,7 +5,7 @@ SRCDIR="." if test $# -ge 1 ; then SRCDIR=$1; shift fi -BACKEND=ldbm +BACKEND=bdb if test $# -ge 1 ; then BACKEND=$1; shift fi diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search index c73254a863..28152ee4ad 100755 --- a/tests/scripts/test003-search +++ b/tests/scripts/test003-search @@ -5,7 +5,7 @@ SRCDIR="." if test $# -ge 1 ; then SRCDIR=$1; shift fi -BACKEND=ldbm +BACKEND=bdb if test $# -ge 1 ; then BACKEND=$1; shift fi diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify index 1eec603db6..2e110dd767 100755 --- a/tests/scripts/test004-modify +++ b/tests/scripts/test004-modify @@ -5,7 +5,7 @@ SRCDIR="." if test $# -ge 1 ; then SRCDIR=$1; shift fi -BACKEND=ldbm +BACKEND=bdb if test $# -ge 1 ; then BACKEND=$1; shift fi diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn index f2ee443f40..66a1b9f271 100755 --- a/tests/scripts/test005-modrdn +++ b/tests/scripts/test005-modrdn @@ -5,7 +5,7 @@ SRCDIR="." if test $# -ge 1 ; then SRCDIR=$1; shift fi -BACKEND=ldbm +BACKEND=bdb if test $# -ge 1 ; then BACKEND=$1; shift fi diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls index 5a97ccc531..c7e1f18697 100755 --- a/tests/scripts/test006-acls +++ b/tests/scripts/test006-acls @@ -5,7 +5,7 @@ SRCDIR="." if test $# -ge 1 ; then SRCDIR=$1; shift fi -BACKEND=ldbm +BACKEND=bdb if test $# -ge 1 ; then BACKEND=$1; shift fi diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication index 22a8aab68c..000cb22331 100755 --- a/tests/scripts/test007-replication +++ b/tests/scripts/test007-replication @@ -5,7 +5,7 @@ SRCDIR="." if test $# -ge 1 ; then SRCDIR=$1; shift fi -BACKEND=ldbm +BACKEND=bdb if test $# -ge 1 ; then BACKEND=$1; shift fi diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency index 24f1722901..a4847f0527 100755 --- a/tests/scripts/test008-concurrency +++ b/tests/scripts/test008-concurrency @@ -5,7 +5,7 @@ SRCDIR="." if test $# -ge 1 ; then SRCDIR=$1; shift fi -BACKEND=ldbm +BACKEND=bdb if test $# -ge 1 ; then BACKEND=$1; shift fi diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral index 09b47df877..7f93c039de 100755 --- a/tests/scripts/test009-referral +++ b/tests/scripts/test009-referral @@ -5,7 +5,7 @@ SRCDIR="." if test $# -ge 1 ; then SRCDIR=$1; shift fi -BACKEND=ldbm +BACKEND=bdb if test $# -ge 1 ; then BACKEND=$1; shift fi diff --git a/tests/scripts/test010-passwd b/tests/scripts/test010-passwd index 080063c709..c8753983ca 100755 --- a/tests/scripts/test010-passwd +++ b/tests/scripts/test010-passwd @@ -5,7 +5,7 @@ SRCDIR="." if test $# -ge 1 ; then SRCDIR=$1; shift fi -BACKEND=ldbm +BACKEND=bdb if test $# -ge 1 ; then BACKEND=$1; shift fi diff --git a/tests/scripts/test011-subtree-repl b/tests/scripts/test011-subtree-repl index 972f0abec4..e7f9d8e879 100755 --- a/tests/scripts/test011-subtree-repl +++ b/tests/scripts/test011-subtree-repl @@ -5,7 +5,7 @@ SRCDIR="." if test $# -ge 1 ; then SRCDIR=$1; shift fi -BACKEND=ldbm +BACKEND=bdb if test $# -ge 1 ; then BACKEND=$1; shift fi diff --git a/tests/scripts/test012-glue b/tests/scripts/test012-glue index 8908773674..b6bbcb7276 100755 --- a/tests/scripts/test012-glue +++ b/tests/scripts/test012-glue @@ -69,7 +69,7 @@ $CMP $SEARCHFLT $LDIFFLT > $CMPOUT if test $? != 0 ; then echo "comparison failed - database was not created correctly" echo $SEARCHFLT $LDIFFLT - diff -iu $SEARCHFLT $LDIFFLT + $DIFF $SEARCHFLT $LDIFFLT exit 1 fi -- 2.39.5