upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-02 13:09:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch the default backend to BDB.

Browse source
This commit is contained in:
Kurt Zeilenga 2002-01-15 17:26:44 +00:00
parent beaf090bbb
commit 94193358b4
20 changed files with 38 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
configure vendored
View file

@ -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

8
configure.in
View file

@ -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

2
tests/Makefile.in
View file

@ -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

2
tests/scripts/all
View file

@ -15,7 +15,7 @@ fi
echo ">>>>> Test Directory: $SRCDIR"
if test $# -eq 0 ; then
BACKEND=ldbm
BACKEND=bdb
else
BACKEND=$1; shift
fi

16
tests/scripts/defines.sh
View file

@ -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

2
tests/scripts/start-master
View file

@ -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

2
tests/scripts/start-master-nolog
View file

@ -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

2
tests/scripts/test000-rootdse
View file

@ -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

4
tests/scripts/test001-slapadd
View file

@ -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

2
tests/scripts/test002-populate
View file

@ -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

2
tests/scripts/test003-search
View file

@ -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

2
tests/scripts/test004-modify
View file

@ -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

2
tests/scripts/test005-modrdn
View file

@ -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

2
tests/scripts/test006-acls
View file

@ -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

2
tests/scripts/test007-replication
View file

@ -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

2
tests/scripts/test008-concurrency
View file

@ -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

2
tests/scripts/test009-referral
View file

@ -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

2
tests/scripts/test010-passwd
View file

@ -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

2
tests/scripts/test011-subtree-repl
View file

@ -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

2
tests/scripts/test012-glue
View file

@ -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