From 97873d8808b2d73d3f259f161e85739d0e76fed9 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Sat, 27 Aug 2011 22:57:21 +0200 Subject: [PATCH 1/3] tests: Add $MAINDB, $INDEXDB for [bhmn]db tests. Simplifies tests for the DB storage backends. Adds indexing etc to mdb/ndb in some cases to match bdb/hdb. This also fixes some broken back-null/back-ldif settings. --- tests/run.in | 13 ++++++++++++- tests/scripts/conf.sh | 2 ++ tests/scripts/test025-limits | 18 +++++++----------- tests/scripts/test049-sync-config | 6 ++---- tests/scripts/test050-syncrepl-multimaster | 6 ++---- tests/scripts/test052-memberof | 14 ++++++++------ tests/scripts/test056-monitor | 8 ++------ tests/scripts/test057-memberof-refint | 14 ++++++++------ tests/scripts/test059-slave-config | 6 ++---- tests/scripts/test063-delta-multimaster | 2 +- 10 files changed, 46 insertions(+), 43 deletions(-) diff --git a/tests/run.in b/tests/run.in index afa6e79277..8e6bbfb00a 100644 --- a/tests/run.in +++ b/tests/run.in @@ -163,11 +163,22 @@ if test -z "$BACKEND" ; then exit 1 fi fi + BACKENDTYPE=`eval 'echo $AC_'$BACKEND` if test "x$BACKENDTYPE" = "x" ; then BACKENDTYPE="unknown" fi -export BACKEND BACKENDTYPE WAIT KILLSERVERS PRESERVE SYNCMODE USERDATA + +# DB types with indexing, and the main DB types with some other stuff: +# currently mode, limits, paged results. +INDEXDB=noindexdb MAINDB=nomaindb +case $BACKEND in + bdb|hdb|mdb) INDEXDB=indexdb MAINDB=maindb ;; + ndb) INDEXDB=indexdb ;; +esac + +export BACKEND BACKENDTYPE INDEXDB MAINDB \ + WAIT KILLSERVERS PRESERVE SYNCMODE USERDATA if test $# = 0 ; then echo "$USAGE"; exit 1 diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh index 4bc949a097..9ac081ee2e 100755 --- a/tests/scripts/conf.sh +++ b/tests/scripts/conf.sh @@ -56,6 +56,8 @@ sed -e "s/@BACKEND@/${BACKEND}/" \ -e "s/^#${AC_translucent}#//" \ -e "s/^#${AC_unique}#//" \ -e "s/^#${AC_valsort}#//" \ + -e "s/^#${INDEXDB}#//" \ + -e "s/^#${MAINDB}#//" \ -e "s/^#${MON}#//" \ -e "s/^#${MONMOD}#//" \ -e "s/^#${SASL}#//" \ diff --git a/tests/scripts/test025-limits b/tests/scripts/test025-limits index 03adacf0ef..04bddd1456 100755 --- a/tests/scripts/test025-limits +++ b/tests/scripts/test025-limits @@ -501,7 +501,7 @@ case $RC in ;; esac -case $BACKEND in bdb | hdb | mdb) +if test $MAINDB = maindb ; then echo "Testing higher than unchecked limit requested for unchecked limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ @@ -554,9 +554,9 @@ case $RC in exit $RC ;; esac -;; -*) echo "Skipping test for unchecked limit with $BACKEND backend." ;; -esac +else + echo "Skipping test for unchecked limit with $BACKEND backend." +fi echo "Testing no limits requested for limited regex..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ @@ -749,17 +749,13 @@ case $RC in ;; esac -case $BACKEND in - bdb | hdb | mdb) - # only bdb|hdb currently supports pagedResults control - ;; - *) +if test $MAINDB != maindb ; then + # only bdb|hdb|mdb currently supports pagedResults control test $KILLSERVERS != no && kill -HUP $KILLPIDS echo ">>>>> Test succeeded" exit 0 - ;; -esac +fi if test x"$SLAPD_PAGE_SIZE" != x ; then PAGESIZE="$SLAPD_PAGE_SIZE" diff --git a/tests/scripts/test049-sync-config b/tests/scripts/test049-sync-config index faa3514c8b..476e5fe9b8 100755 --- a/tests/scripts/test049-sync-config +++ b/tests/scripts/test049-sync-config @@ -265,8 +265,7 @@ if test $RC != 0 ; then exit $RC fi -case $BACKEND in -bdb | hdb) +if test $INDEXDB = indexdb ; then $LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <>$TESTOUT 2>&1 dn: olcDatabase={1}$BACKEND,cn=config changetype: modify @@ -280,8 +279,7 @@ EOF test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi - ;; -esac +fi echo "Using ldapadd to populate provider..." $LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD -f $LDIFORDERED \ diff --git a/tests/scripts/test050-syncrepl-multimaster b/tests/scripts/test050-syncrepl-multimaster index 9492896f85..57851a3d98 100755 --- a/tests/scripts/test050-syncrepl-multimaster +++ b/tests/scripts/test050-syncrepl-multimaster @@ -311,8 +311,7 @@ if test $RC != 0 ; then exit $RC fi -case $BACKEND in -bdb | hdb) +if test $INDEXDB = indexdb ; then $LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <>$TESTOUT 2>&1 dn: olcDatabase={1}$BACKEND,cn=config changetype: modify @@ -326,8 +325,7 @@ EOF test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi - ;; -esac +fi echo "Using ldapadd to populate server 1..." $LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD -f $LDIFORDERED \ diff --git a/tests/scripts/test052-memberof b/tests/scripts/test052-memberof index e3c524b3f6..b697ad8ae5 100755 --- a/tests/scripts/test052-memberof +++ b/tests/scripts/test052-memberof @@ -72,7 +72,9 @@ EOF fi fi -bdbInclude="# " nullExclude="" +indexInclude="" mainInclude="" bdbInclude="# " nullExclude="" +test $INDEXDB = indexdb || indexInclude="# " +test $MAINDB = maindb || mainInclude="# " case $BACKEND in bdb | hdb) bdbInclude="" ;; null) nullExclude="# " ;; @@ -111,11 +113,11 @@ olcRootPW:: c2VjcmV0 olcMonitoring: TRUE ${nullExclude}olcDbDirectory: $TESTDIR/db.1.a/ ${bdbInclude}olcDbCacheSize: 1000 -${bdbInclude}olcDbIndex: objectClass eq -${bdbInclude}olcDbIndex: cn pres,eq,sub -${bdbInclude}olcDbIndex: uid pres,eq,sub -${bdbInclude}olcDbIndex: sn pres,eq,sub -${bdbInclude}olcDbMode: 384" +${indexInclude}olcDbIndex: objectClass eq +${indexInclude}olcDbIndex: cn pres,eq,sub +${indexInclude}olcDbIndex: uid pres,eq,sub +${indexInclude}olcDbIndex: sn pres,eq,sub +${mainInclude}olcDbMode: 384" dn: olcOverlay={0}memberof,olcDatabase={1}$BACKEND,cn=config objectClass: olcOverlayConfig diff --git a/tests/scripts/test056-monitor b/tests/scripts/test056-monitor index d8cfdb9946..4220177ca8 100755 --- a/tests/scripts/test056-monitor +++ b/tests/scripts/test056-monitor @@ -100,14 +100,10 @@ echo "Filtering ldapsearch results..." $LDIFFILTER -b monitor < $SEARCHOUT > $SEARCHFLT TMPMONITOROUT2=$MONITOROUT2 -case $BACKEND in -bdb|hdb) - ;; -*) +if test $MAINDB != maindb ; then TMPMONITOROUT2=$TESTDIR/monitor2.out grep -v "olmBDB" $MONITOROUT2 > $TMPMONITOROUT2 - ;; -esac +fi echo "Comparing filter output..." $CMP $SEARCHFLT $TMPMONITOROUT2 > $CMPOUT diff --git a/tests/scripts/test057-memberof-refint b/tests/scripts/test057-memberof-refint index 46d940bae0..a36ba9eb2b 100755 --- a/tests/scripts/test057-memberof-refint +++ b/tests/scripts/test057-memberof-refint @@ -66,7 +66,9 @@ fi cat /dev/null > $TESTOUT -bdbInclude="# " nullExclude="" +indexInclude="" mainInclude="" bdbInclude="# " nullExclude="" +test $INDEXDB = indexdb || indexInclude="# " +test $MAINDB = maindb || mainInclude="# " case $BACKEND in bdb | hdb) bdbInclude="" ;; null) nullExclude="# " ;; @@ -103,11 +105,11 @@ olcRootPW:: c2VjcmV0 olcMonitoring: TRUE ${nullExclude}olcDbDirectory: $TESTDIR/db.1.a/ ${bdbInclude}olcDbCacheSize: 1000 -${bdbInclude}olcDbIndex: objectClass eq -${bdbInclude}olcDbIndex: cn pres,eq,sub -${bdbInclude}olcDbIndex: uid pres,eq,sub -${bdbInclude}olcDbIndex: sn pres,eq,sub -${bdbInclude}olcDbMode: 384 +${indexInclude}olcDbIndex: objectClass eq +${indexInclude}olcDbIndex: cn pres,eq,sub +${indexInclude}olcDbIndex: uid pres,eq,sub +${indexInclude}olcDbIndex: sn pres,eq,sub +${mainInclude}olcDbMode: 384 # {0}memberof, {1}$BACKEND, config dn: olcOverlay={0}memberof,olcDatabase={1}$BACKEND,cn=config diff --git a/tests/scripts/test059-slave-config b/tests/scripts/test059-slave-config index bc2a9c77c3..2dc7b3e0bd 100755 --- a/tests/scripts/test059-slave-config +++ b/tests/scripts/test059-slave-config @@ -337,8 +337,7 @@ if test $RC != 0 ; then exit $RC fi -case $BACKEND in -bdb | hdb) +if test $INDEXDB = indexdb ; then $LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <>$TESTOUT 2>&1 dn: olcDatabase={2}$BACKEND,cn=config changetype: modify @@ -352,8 +351,7 @@ EOF test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi - ;; -esac +fi echo "Using ldapadd to populate provider..." $LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD -f $LDIFORDERED \ diff --git a/tests/scripts/test063-delta-multimaster b/tests/scripts/test063-delta-multimaster index af043057dd..c24bd687af 100755 --- a/tests/scripts/test063-delta-multimaster +++ b/tests/scripts/test063-delta-multimaster @@ -113,7 +113,7 @@ EOF fi MYURI=`eval echo '$URI'$n` PROVIDERURI=`eval echo '$URI'$o` -if [ $BACKEND = hdb -o $BACKEND = bdb ]; then +if test $INDEXDB = indexdb ; then INDEX1="olcDbIndex: objectClass,entryCSN,reqStart,reqDN eq" INDEX2="olcDbIndex: objectClass,entryCSN,entryUUID eq" else From cc2b67329ae8e5c6a93acaa64d98c26a3d47fe8e Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Sun, 28 Aug 2011 11:19:43 +0200 Subject: [PATCH 2/3] tests/data/: #bdb/hdb|mdb# -> #maindb/indexdb#. Done for keywords index,limits. (Also do 'mode' if there were any cases.) Change generated by: perl -i -pw0777e ' INIT { $q=qr/\#(?:[bhm]|index|main)db\#/im; $k=qr/(?:index|limits|mode)\b/ } 0 while s/^$q($k.*\n)((?:$q.*\n)*?)\n?$q\1/\#maindb\#$1$2/imo; s/^\#maindb\#index/\#indexdb\#index/igm; ' tests/data/* tests/data/regressions/*/* --- tests/data/regressions/its4184/slapd.conf | 18 ++++------ .../data/regressions/its6794/slapd-glue.conf | 27 +++++---------- tests/data/slapd-2db.conf | 12 +++---- tests/data/slapd-aci.conf | 6 ++-- tests/data/slapd-acl.conf | 6 ++-- tests/data/slapd-cache-master.conf | 6 ++-- tests/data/slapd-chain1.conf | 6 ++-- tests/data/slapd-chain2.conf | 6 ++-- tests/data/slapd-component.conf | 3 +- tests/data/slapd-config-undo.conf | 6 ++-- tests/data/slapd-dds.conf | 9 ++--- tests/data/slapd-deltasync-master.conf | 15 +++------ tests/data/slapd-deltasync-slave.conf | 6 ++-- tests/data/slapd-dn.conf | 6 ++-- tests/data/slapd-dynlist.conf | 6 ++-- tests/data/slapd-emptydn.conf | 12 +++---- tests/data/slapd-glue-syncrepl1.conf | 33 +++++++------------ tests/data/slapd-glue-syncrepl2.conf | 33 +++++++------------ tests/data/slapd-glue.conf | 27 +++++---------- tests/data/slapd-idassert.conf | 12 +++---- tests/data/slapd-ldapglue.conf | 6 ++-- tests/data/slapd-ldapgluegroups.conf | 6 ++-- tests/data/slapd-ldapgluepeople.conf | 6 ++-- tests/data/slapd-limits.conf | 26 ++++----------- tests/data/slapd-master.conf | 3 +- tests/data/slapd-meta-target1.conf | 6 ++-- tests/data/slapd-meta-target2.conf | 6 ++-- tests/data/slapd-ppolicy.conf | 3 +- tests/data/slapd-proxycache.conf | 6 ++-- tests/data/slapd-pw.conf | 6 ++-- tests/data/slapd-ref-slave.conf | 6 ++-- tests/data/slapd-referrals.conf | 3 +- tests/data/slapd-refint.conf | 6 ++-- tests/data/slapd-relay.conf | 3 +- tests/data/slapd-repl-slave-remote.conf | 9 ++--- tests/data/slapd-retcode.conf | 6 ++-- tests/data/slapd-schema.conf | 3 +- tests/data/slapd-syncrepl-master.conf | 9 ++--- tests/data/slapd-syncrepl-multiproxy.conf | 9 ++--- tests/data/slapd-syncrepl-slave-persist1.conf | 9 ++--- tests/data/slapd-syncrepl-slave-persist2.conf | 9 ++--- tests/data/slapd-syncrepl-slave-persist3.conf | 9 ++--- tests/data/slapd-syncrepl-slave-refresh1.conf | 9 ++--- tests/data/slapd-syncrepl-slave-refresh2.conf | 9 ++--- tests/data/slapd-translucent-local.conf | 6 ++-- tests/data/slapd-translucent-remote.conf | 6 ++-- tests/data/slapd-unique.conf | 6 ++-- tests/data/slapd-valregex.conf | 6 ++-- tests/data/slapd-valsort.conf | 6 ++-- tests/data/slapd-whoami.conf | 6 ++-- tests/data/slapd.conf | 6 ++-- tests/data/slapd2.conf | 6 ++-- 52 files changed, 156 insertions(+), 320 deletions(-) diff --git a/tests/data/regressions/its4184/slapd.conf b/tests/data/regressions/its4184/slapd.conf index 030cc9dd7c..ed23ef8f83 100644 --- a/tests/data/regressions/its4184/slapd.conf +++ b/tests/data/regressions/its4184/slapd.conf @@ -41,12 +41,9 @@ rootdn "cn=Manager,dc=example,dc=com" #~null~#directory @TESTDIR@/db.2.a # Indices to maintain -#bdb#index default pres,eq -#bdb#index objectClass eq -#bdb#index sn pres,eq,sub -#hdb#index default pres,eq -#hdb#index objectClass eq -#hdb#index sn pres,eq,sub +#indexdb#index default pres,eq +#indexdb#index objectClass eq +#indexdb#index sn pres,eq,sub database @BACKEND@ suffix "dc=example,dc=com" @@ -56,10 +53,7 @@ rootpw secret #~null~#directory @TESTDIR@/db.1.a # Indices to maintain -#bdb#index default pres,eq -#bdb#index objectClass eq -#bdb#index sn pres,eq,sub -#hdb#index default pres,eq -#hdb#index objectClass eq -#hdb#index sn pres,eq,sub +#indexdb#index default pres,eq +#indexdb#index objectClass eq +#indexdb#index sn pres,eq,sub diff --git a/tests/data/regressions/its6794/slapd-glue.conf b/tests/data/regressions/its6794/slapd-glue.conf index 01a109fa2a..e95e96aeec 100644 --- a/tests/data/regressions/its6794/slapd-glue.conf +++ b/tests/data/regressions/its6794/slapd-glue.conf @@ -35,12 +35,9 @@ suffix "ou=Information Technology Division,ou=People,dc=example,dc=com" subordinate rootdn "cn=Manager, dc=example,dc=com" #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectclass eq -#bdb#index uid pres,eq,sub -#bdb#index cn,sn pres,eq,sub,subany -#hdb#index objectclass eq -#hdb#index uid pres,eq,sub -#hdb#index cn,sn pres,eq,sub,subany +#indexdb#index objectclass eq +#indexdb#index uid pres,eq,sub +#indexdb#index cn,sn pres,eq,sub,subany #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf @@ -49,12 +46,9 @@ suffix "ou=Groups,dc=example,dc=com" subordinate rootdn "cn=Manager, dc=example,dc=com" #~null~#directory @TESTDIR@/db.1.b -#bdb#index objectclass eq -#bdb#index uid pres,eq,sub -#bdb#index cn,sn pres,eq,sub,subany -#hdb#index objectclass eq -#hdb#index uid pres,eq,sub -#hdb#index cn,sn pres,eq,sub,subany +#indexdb#index objectclass eq +#indexdb#index uid pres,eq,sub +#indexdb#index cn,sn pres,eq,sub,subany #ndb#dbname db_2 #ndb#include @DATADIR@/ndb.conf @@ -63,12 +57,9 @@ suffix "dc=example,dc=com" rootdn "cn=Manager, dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.c -#bdb#index objectclass eq -#bdb#index uid pres,eq,sub -#bdb#index cn pres,eq,sub,subany -#hdb#index objectclass eq -#hdb#index uid pres,eq,sub -#hdb#index cn pres,eq,sub,subany +#indexdb#index objectclass eq +#indexdb#index uid pres,eq,sub +#indexdb#index cn pres,eq,sub,subany #ndb#dbname db_3 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-2db.conf b/tests/data/slapd-2db.conf index 57b910db03..6028465f3d 100644 --- a/tests/data/slapd-2db.conf +++ b/tests/data/slapd-2db.conf @@ -34,10 +34,8 @@ database @BACKEND@ suffix "cn=Everyone,ou=Groups,dc=example,dc=com" subordinate #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf @@ -46,10 +44,8 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.b -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_2 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-aci.conf b/tests/data/slapd-aci.conf index 7c823ba6f1..4db6fe3cd4 100644 --- a/tests/data/slapd-aci.conf +++ b/tests/data/slapd-aci.conf @@ -46,10 +46,8 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf index 5e06783cce..6e95909246 100644 --- a/tests/data/slapd-acl.conf +++ b/tests/data/slapd-acl.conf @@ -46,10 +46,8 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf add_content_acl on diff --git a/tests/data/slapd-cache-master.conf b/tests/data/slapd-cache-master.conf index a4b32bb897..a6a703a7b6 100644 --- a/tests/data/slapd-cache-master.conf +++ b/tests/data/slapd-cache-master.conf @@ -36,10 +36,8 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-chain1.conf b/tests/data/slapd-chain1.conf index 3fd94886e1..4b7daef1e5 100644 --- a/tests/data/slapd-chain1.conf +++ b/tests/data/slapd-chain1.conf @@ -55,10 +55,8 @@ rootdn "cn=Manager,dc=example,dc=com" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-chain2.conf b/tests/data/slapd-chain2.conf index 88b272ca8a..694c2cd93e 100644 --- a/tests/data/slapd-chain2.conf +++ b/tests/data/slapd-chain2.conf @@ -43,10 +43,8 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.2.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_2 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-component.conf b/tests/data/slapd-component.conf index 61e2b79d6f..fe88c09ff2 100644 --- a/tests/data/slapd-component.conf +++ b/tests/data/slapd-component.conf @@ -41,8 +41,7 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#hdb#index objectClass eq +#indexdb#index objectClass eq #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-config-undo.conf b/tests/data/slapd-config-undo.conf index 82b5af068c..3487acc42e 100644 --- a/tests/data/slapd-config-undo.conf +++ b/tests/data/slapd-config-undo.conf @@ -10,10 +10,8 @@ suffix "o=undo" rootdn "cn=Manager,o=undo" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-dds.conf b/tests/data/slapd-dds.conf index 2db83da579..7a4ac1c6a2 100644 --- a/tests/data/slapd-dds.conf +++ b/tests/data/slapd-dds.conf @@ -40,12 +40,9 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#bdb#index entryExpireTimestamp eq -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub -#hdb#index entryExpireTimestamp eq +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub +#indexdb#index entryExpireTimestamp eq #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf add_content_acl on diff --git a/tests/data/slapd-deltasync-master.conf b/tests/data/slapd-deltasync-master.conf index 5e875bc01f..04237ab367 100644 --- a/tests/data/slapd-deltasync-master.conf +++ b/tests/data/slapd-deltasync-master.conf @@ -39,10 +39,8 @@ database @BACKEND@ suffix "cn=log" rootdn "cn=Manager,dc=example,dc=com" #~null~#directory @TESTDIR@/db.1.b -#bdb#index objectClass eq -#bdb#index entryUUID,entryCSN eq -#hdb#index objectClass eq -#hdb#index entryUUID,entryCSN eq +#indexdb#index objectClass eq +#indexdb#index entryUUID,entryCSN eq #ndb#dbname db_2 #ndb#include @DATADIR@/ndb.conf @@ -56,12 +54,9 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#bdb#index entryUUID,entryCSN eq -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub -#hdb#index entryUUID,entryCSN eq +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub +#indexdb#index entryUUID,entryCSN eq #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-deltasync-slave.conf b/tests/data/slapd-deltasync-slave.conf index 99e70875c5..49e4baed03 100644 --- a/tests/data/slapd-deltasync-slave.conf +++ b/tests/data/slapd-deltasync-slave.conf @@ -48,10 +48,8 @@ rootdn "cn=Replica,dc=example,dc=com" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.2.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_3 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-dn.conf b/tests/data/slapd-dn.conf index 76d2172d51..7112537fd7 100644 --- a/tests/data/slapd-dn.conf +++ b/tests/data/slapd-dn.conf @@ -38,10 +38,8 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-dynlist.conf b/tests/data/slapd-dynlist.conf index ad6be5c20b..a899dd9a2d 100644 --- a/tests/data/slapd-dynlist.conf +++ b/tests/data/slapd-dynlist.conf @@ -43,10 +43,8 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-emptydn.conf b/tests/data/slapd-emptydn.conf index a5111fb3d1..29eec3f85a 100644 --- a/tests/data/slapd-emptydn.conf +++ b/tests/data/slapd-emptydn.conf @@ -43,10 +43,8 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf @@ -68,10 +66,8 @@ suffix "" rootdn "cn=Manager,c=US" rootpw secret #~null~#directory @TESTDIR@/db.2.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_2 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-glue-syncrepl1.conf b/tests/data/slapd-glue-syncrepl1.conf index 9a5b70dea2..bfb724ffec 100644 --- a/tests/data/slapd-glue-syncrepl1.conf +++ b/tests/data/slapd-glue-syncrepl1.conf @@ -36,14 +36,10 @@ suffix "ou=Information Technology Division,ou=People,dc=example,dc=com" subordinate rootdn "cn=Manager 1,dc=example,dc=com" #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectclass eq -#bdb#index uid pres,eq,sub -#bdb#index cn,sn pres,eq,sub,subany -#bdb#index entryUUID,entryCSN pres -#hdb#index objectclass eq -#hdb#index uid pres,eq,sub -#hdb#index cn,sn pres,eq,sub,subany -#hdb#index entryUUID,entryCSN pres +#indexdb#index objectclass eq +#indexdb#index uid pres,eq,sub +#indexdb#index cn,sn pres,eq,sub,subany +#indexdb#index entryUUID,entryCSN pres #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf @@ -54,14 +50,10 @@ suffix "ou=Groups,dc=example,dc=com" subordinate rootdn "cn=Manager 1,dc=example,dc=com" #~null~#directory @TESTDIR@/db.1.b -#bdb#index objectclass eq -#bdb#index uid pres,eq,sub -#bdb#index cn,sn pres,eq,sub,subany -#bdb#index entryUUID,entryCSN pres -#hdb#index objectclass eq -#hdb#index uid pres,eq,sub -#hdb#index cn,sn pres,eq,sub,subany -#hdb#index entryUUID,entryCSN pres +#indexdb#index objectclass eq +#indexdb#index uid pres,eq,sub +#indexdb#index cn,sn pres,eq,sub,subany +#indexdb#index entryUUID,entryCSN pres #ndb#dbname db_2 #ndb#include @DATADIR@/ndb.conf @@ -86,12 +78,9 @@ suffix "dc=example,dc=com" rootdn "cn=Manager 1,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.c -#bdb#index objectclass eq -#bdb#index uid pres,eq,sub -#bdb#index cn,sn pres,eq,sub,subany -#hdb#index objectclass eq -#hdb#index uid pres,eq,sub -#hdb#index cn,sn pres,eq,sub,subany +#indexdb#index objectclass eq +#indexdb#index uid pres,eq,sub +#indexdb#index cn,sn pres,eq,sub,subany #ndb#dbname db_3 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-glue-syncrepl2.conf b/tests/data/slapd-glue-syncrepl2.conf index 1d08a62bd7..77c090bc35 100644 --- a/tests/data/slapd-glue-syncrepl2.conf +++ b/tests/data/slapd-glue-syncrepl2.conf @@ -36,14 +36,10 @@ suffix "ou=Information Technology Division,ou=People,dc=example,dc=com" subordinate rootdn "cn=Manager 2,dc=example,dc=com" #~null~#directory @TESTDIR@/db.2.a -#bdb#index objectclass eq -#bdb#index uid pres,eq,sub -#bdb#index cn,sn pres,eq,sub,subany -#bdb#index entryUUID,entryCSN pres -#hdb#index objectclass eq -#hdb#index uid pres,eq,sub -#hdb#index cn,sn pres,eq,sub,subany -#hdb#index entryUUID,entryCSN pres +#indexdb#index objectclass eq +#indexdb#index uid pres,eq,sub +#indexdb#index cn,sn pres,eq,sub,subany +#indexdb#index entryUUID,entryCSN pres #ndb#dbname db_4 #ndb#include @DATADIR@/ndb.conf @@ -68,14 +64,10 @@ suffix "ou=Groups,dc=example,dc=com" subordinate rootdn "cn=Manager 2,dc=example,dc=com" #~null~#directory @TESTDIR@/db.2.b -#bdb#index objectclass eq -#bdb#index uid pres,eq,sub -#bdb#index cn,sn pres,eq,sub,subany -#bdb#index entryUUID,entryCSN pres -#hdb#index objectclass eq -#hdb#index uid pres,eq,sub -#hdb#index cn,sn pres,eq,sub,subany -#hdb#index entryUUID,entryCSN pres +#indexdb#index objectclass eq +#indexdb#index uid pres,eq,sub +#indexdb#index cn,sn pres,eq,sub,subany +#indexdb#index entryUUID,entryCSN pres #ndb#dbname db_5 #ndb#include @DATADIR@/ndb.conf @@ -88,12 +80,9 @@ suffix "dc=example,dc=com" rootdn "cn=Manager 2,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.2.c -#bdb#index objectclass eq -#bdb#index uid pres,eq,sub -#bdb#index cn,sn pres,eq,sub,subany -#hdb#index objectclass eq -#hdb#index uid pres,eq,sub -#hdb#index cn,sn pres,eq,sub,subany +#indexdb#index objectclass eq +#indexdb#index uid pres,eq,sub +#indexdb#index cn,sn pres,eq,sub,subany #ndb#dbname db_6 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf index b977611b39..0e9f15e9d2 100644 --- a/tests/data/slapd-glue.conf +++ b/tests/data/slapd-glue.conf @@ -35,12 +35,9 @@ suffix "ou=Information Technology Division,ou=People,dc=example,dc=com" subordinate rootdn "cn=Manager, dc=example,dc=com" #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectclass eq -#bdb#index uid pres,eq,sub -#bdb#index cn,sn pres,eq,sub,subany -#hdb#index objectclass eq -#hdb#index uid pres,eq,sub -#hdb#index cn,sn pres,eq,sub,subany +#indexdb#index objectclass eq +#indexdb#index uid pres,eq,sub +#indexdb#index cn,sn pres,eq,sub,subany #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf @@ -49,12 +46,9 @@ suffix "ou=Groups,dc=example,dc=com" subordinate rootdn "cn=Manager, dc=example,dc=com" #~null~#directory @TESTDIR@/db.1.b -#bdb#index objectclass eq -#bdb#index uid pres,eq,sub -#bdb#index cn,sn pres,eq,sub,subany -#hdb#index objectclass eq -#hdb#index uid pres,eq,sub -#hdb#index cn,sn pres,eq,sub,subany +#indexdb#index objectclass eq +#indexdb#index uid pres,eq,sub +#indexdb#index cn,sn pres,eq,sub,subany #ndb#dbname db_2 #ndb#include @DATADIR@/ndb.conf @@ -63,12 +57,9 @@ suffix "dc=example,dc=com" rootdn "cn=Manager, dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.c -#bdb#index objectclass eq -#bdb#index uid pres,eq,sub -#bdb#index cn,sn pres,eq,sub,subany -#hdb#index objectclass eq -#hdb#index uid pres,eq,sub -#hdb#index cn,sn pres,eq,sub,subany +#indexdb#index objectclass eq +#indexdb#index uid pres,eq,sub +#indexdb#index cn,sn pres,eq,sub,subany #ndb#dbname db_3 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-idassert.conf b/tests/data/slapd-idassert.conf index a4022489cf..2c680fc3a2 100644 --- a/tests/data/slapd-idassert.conf +++ b/tests/data/slapd-idassert.conf @@ -63,10 +63,8 @@ rootdn "cn=Manager,dc=example,dc=com" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf @@ -81,10 +79,8 @@ suffix "dc=example,dc=it" rootdn "cn=Manager,dc=example,dc=it" rootpw secret #~null~#directory @TESTDIR@/db.2.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_2 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-ldapglue.conf b/tests/data/slapd-ldapglue.conf index bb3a340388..95c69b84d4 100644 --- a/tests/data/slapd-ldapglue.conf +++ b/tests/data/slapd-ldapglue.conf @@ -71,10 +71,8 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-ldapgluegroups.conf b/tests/data/slapd-ldapgluegroups.conf index 776b89cd4d..b50716d6f3 100644 --- a/tests/data/slapd-ldapgluegroups.conf +++ b/tests/data/slapd-ldapgluegroups.conf @@ -53,10 +53,8 @@ suffix "ou=Groups,dc=example,dc=com" rootdn "cn=Manager,ou=Groups,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.3.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_6 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-ldapgluepeople.conf b/tests/data/slapd-ldapgluepeople.conf index eabd5c4a42..0c65c57fd9 100644 --- a/tests/data/slapd-ldapgluepeople.conf +++ b/tests/data/slapd-ldapgluepeople.conf @@ -55,10 +55,8 @@ rootdn "cn=Manager,ou=People,dc=example,dc=com" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.2.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_5 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-limits.conf b/tests/data/slapd-limits.conf index 05105f95b5..9546acd318 100644 --- a/tests/data/slapd-limits.conf +++ b/tests/data/slapd-limits.conf @@ -38,30 +38,16 @@ rootpw secret #~null~#directory @TESTDIR@/db.1.a # Need quality indices on "uid" to check "unchecked" limits... -#bdb#index objectClass eq -#bdb#index uid eq -#hdb#index objectClass eq -#hdb#index uid eq -#mdb#index objectClass eq -#mdb#index uid eq +#indexdb#index objectClass eq +#indexdb#index uid eq #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf # Need extra limits for pagedResults on backends that support it... -#bdb#limits dn.exact="cn=Unlimited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=unlimited -#bdb#limits dn.exact="cn=Page Size Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=4 -#bdb#limits dn.exact="cn=Paged Results Disabled User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=disabled -#bdb#limits dn.exact="cn=Paged Results Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=10 - -#hdb#limits dn.exact="cn=Unlimited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=unlimited -#hdb#limits dn.exact="cn=Page Size Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=4 -#hdb#limits dn.exact="cn=Paged Results Disabled User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=disabled -#hdb#limits dn.exact="cn=Paged Results Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=10 - -#mdb#limits dn.exact="cn=Unlimited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=unlimited -#mdb#limits dn.exact="cn=Page Size Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=4 -#mdb#limits dn.exact="cn=Paged Results Disabled User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=disabled -#mdb#limits dn.exact="cn=Paged Results Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=10 +#maindb#limits dn.exact="cn=Unlimited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=unlimited +#maindb#limits dn.exact="cn=Page Size Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.pr=4 +#maindb#limits dn.exact="cn=Paged Results Disabled User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=disabled +#maindb#limits dn.exact="cn=Paged Results Limited User,ou=Paged Results Users,dc=example,dc=com" size=4 size.prtotal=10 limits dn.exact="cn=Unlimited User,ou=People,dc=example,dc=com" size=unlimited time=unlimited limits dn.exact="cn=Soft Limited User,ou=People,dc=example,dc=com" size.soft=4 size.hard=unlimited diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf index a574ef0d8b..43ff55ade5 100644 --- a/tests/data/slapd-master.conf +++ b/tests/data/slapd-master.conf @@ -38,8 +38,7 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#hdb#index objectClass eq +#indexdb#index objectClass eq #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-meta-target1.conf b/tests/data/slapd-meta-target1.conf index 14c0a3fd7f..f8c977506a 100644 --- a/tests/data/slapd-meta-target1.conf +++ b/tests/data/slapd-meta-target1.conf @@ -42,10 +42,8 @@ rootdn "cn=Manager,dc=example,dc=com" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-meta-target2.conf b/tests/data/slapd-meta-target2.conf index 1fab34c522..0439031b7d 100644 --- a/tests/data/slapd-meta-target2.conf +++ b/tests/data/slapd-meta-target2.conf @@ -47,10 +47,8 @@ rootdn "cn=Manager,ou=Meta,dc=example,dc=com" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.2.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_2 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-ppolicy.conf b/tests/data/slapd-ppolicy.conf index 6a42bcee35..ff7acf04f8 100644 --- a/tests/data/slapd-ppolicy.conf +++ b/tests/data/slapd-ppolicy.conf @@ -36,8 +36,7 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#hdb#index objectClass eq +#indexdb#index objectClass eq #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-proxycache.conf b/tests/data/slapd-proxycache.conf index 6bd54585ee..3889daf5bd 100644 --- a/tests/data/slapd-proxycache.conf +++ b/tests/data/slapd-proxycache.conf @@ -58,10 +58,8 @@ pcachebind (&(objectclass=person)(uid=)) 1 @BTTR@ sub "ou=Alumni Association,ou #hdb#cachesize 20 #~null~#directory @TESTDIR@/db.2.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid,mail pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid,mail pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid,mail pres,eq,sub #ndb#dbname db_2 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf index 2b4a47ae64..39602073ac 100644 --- a/tests/data/slapd-pw.conf +++ b/tests/data/slapd-pw.conf @@ -37,10 +37,8 @@ rootdn "cn=Manager,dc=example,dc=com" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf index 813ee64294..4c6a72a8a6 100644 --- a/tests/data/slapd-ref-slave.conf +++ b/tests/data/slapd-ref-slave.conf @@ -41,10 +41,8 @@ suffix "o=University of Mich,c=US" rootdn "cn=Manager,o=University of Mich,c=US" rootpw secret #~null~#directory @TESTDIR@/db.2.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_2 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-referrals.conf b/tests/data/slapd-referrals.conf index dd5bd5f4db..b4bb128963 100644 --- a/tests/data/slapd-referrals.conf +++ b/tests/data/slapd-referrals.conf @@ -35,8 +35,7 @@ suffix "c=us" rootdn "cn=Manager,c=us" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#hdb#index objectClass eq +#indexdb#index objectClass eq #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-refint.conf b/tests/data/slapd-refint.conf index 3fdff56bdd..4f57cb5104 100644 --- a/tests/data/slapd-refint.conf +++ b/tests/data/slapd-refint.conf @@ -39,10 +39,8 @@ suffix "o=refint" rootdn "cn=Manager,o=refint" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-relay.conf b/tests/data/slapd-relay.conf index 7444f0257d..ed4aa0d259 100644 --- a/tests/data/slapd-relay.conf +++ b/tests/data/slapd-relay.conf @@ -45,8 +45,7 @@ rootdn "cn=Manager,dc=example,dc=com" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#hdb#index objectClass eq +#indexdb#index objectClass eq #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-repl-slave-remote.conf b/tests/data/slapd-repl-slave-remote.conf index 3a3c4a13ae..fcc4d235b9 100644 --- a/tests/data/slapd-repl-slave-remote.conf +++ b/tests/data/slapd-repl-slave-remote.conf @@ -58,12 +58,9 @@ updatedn "cn=Monitor" updateref @URI1@ #null#bind on #~null~#directory @TESTDIR@/db.2.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#bdb#index entryUUID pres,eq -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub -#hdb#index entryUUID pres,eq +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub +#indexdb#index entryUUID pres,eq #ndb#dbname db_2 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-retcode.conf b/tests/data/slapd-retcode.conf index 224cf7b462..bce3b102eb 100644 --- a/tests/data/slapd-retcode.conf +++ b/tests/data/slapd-retcode.conf @@ -40,10 +40,8 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf index ba14c73bef..315bfbb429 100644 --- a/tests/data/slapd-schema.conf +++ b/tests/data/slapd-schema.conf @@ -47,8 +47,7 @@ rootdse @DATADIR@/rootdse.ldif database @BACKEND@ suffix "o=OpenLDAP Project,l=Internet" #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#hdb#index objectClass eq +#indexdb#index objectClass eq #ndb#dbname db_1_a #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-syncrepl-master.conf b/tests/data/slapd-syncrepl-master.conf index e9083385f7..eb92fdc6c7 100644 --- a/tests/data/slapd-syncrepl-master.conf +++ b/tests/data/slapd-syncrepl-master.conf @@ -38,12 +38,9 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#bdb#index entryUUID,entryCSN eq -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub -#hdb#index entryUUID,entryCSN eq +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub +#indexdb#index entryUUID,entryCSN eq #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-syncrepl-multiproxy.conf b/tests/data/slapd-syncrepl-multiproxy.conf index a8bea95554..b91d141eba 100644 --- a/tests/data/slapd-syncrepl-multiproxy.conf +++ b/tests/data/slapd-syncrepl-multiproxy.conf @@ -40,12 +40,9 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#bdb#index entryUUID,entryCSN eq -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub -#hdb#index entryUUID,entryCSN eq +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub +#indexdb#index entryUUID,entryCSN eq #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-syncrepl-slave-persist1.conf b/tests/data/slapd-syncrepl-slave-persist1.conf index 141b87c62e..2a05717315 100644 --- a/tests/data/slapd-syncrepl-slave-persist1.conf +++ b/tests/data/slapd-syncrepl-slave-persist1.conf @@ -48,12 +48,9 @@ rootdn "cn=Replica,dc=example,dc=com" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.4.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#bdb#index entryUUID,entryCSN eq -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub -#hdb#index entryUUID,entryCSN eq +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub +#indexdb#index entryUUID,entryCSN eq #ndb#dbname db_4 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-syncrepl-slave-persist2.conf b/tests/data/slapd-syncrepl-slave-persist2.conf index 6412cd5383..16be0020a0 100644 --- a/tests/data/slapd-syncrepl-slave-persist2.conf +++ b/tests/data/slapd-syncrepl-slave-persist2.conf @@ -24,12 +24,9 @@ suffix "dc=example,dc=com" rootdn "cn=Replica,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.5.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#bdb#index entryUUID,entryCSN eq -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub -#hdb#index entryUUID,entryCSN eq +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub +#indexdb#index entryUUID,entryCSN eq #ndb#dbname db_5 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-syncrepl-slave-persist3.conf b/tests/data/slapd-syncrepl-slave-persist3.conf index 94cfb51b96..32050140d6 100644 --- a/tests/data/slapd-syncrepl-slave-persist3.conf +++ b/tests/data/slapd-syncrepl-slave-persist3.conf @@ -36,12 +36,9 @@ suffix "dc=example,dc=com" rootdn "cn=Replica,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.6.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#bdb#index entryUUID,entryCSN eq -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub -#hdb#index entryUUID,entryCSN eq +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub +#indexdb#index entryUUID,entryCSN eq #ndb#dbname db_6 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-syncrepl-slave-refresh1.conf b/tests/data/slapd-syncrepl-slave-refresh1.conf index 2160dcb83c..988566dee0 100644 --- a/tests/data/slapd-syncrepl-slave-refresh1.conf +++ b/tests/data/slapd-syncrepl-slave-refresh1.conf @@ -39,12 +39,9 @@ rootdn "cn=Replica,dc=example,dc=com" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.2.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#bdb#index entryUUID,entryCSN eq -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub -#hdb#index entryUUID,entryCSN eq +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub +#indexdb#index entryUUID,entryCSN eq #ndb#dbname db_2 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-syncrepl-slave-refresh2.conf b/tests/data/slapd-syncrepl-slave-refresh2.conf index 016202aa6b..cd15e3f666 100644 --- a/tests/data/slapd-syncrepl-slave-refresh2.conf +++ b/tests/data/slapd-syncrepl-slave-refresh2.conf @@ -36,12 +36,9 @@ suffix "dc=example,dc=com" rootdn "cn=Replica,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.3.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#bdb#index entryUUID,entryCSN eq -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub -#hdb#index entryUUID,entryCSN eq +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub +#indexdb#index entryUUID,entryCSN eq #ndb#dbname db_3 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-translucent-local.conf b/tests/data/slapd-translucent-local.conf index bb7dc5c07b..cff497ec3e 100644 --- a/tests/data/slapd-translucent-local.conf +++ b/tests/data/slapd-translucent-local.conf @@ -45,10 +45,8 @@ rootdn "o=translucent" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.2.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_2 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-translucent-remote.conf b/tests/data/slapd-translucent-remote.conf index 2234df0f44..ee93b9c1a7 100644 --- a/tests/data/slapd-translucent-remote.conf +++ b/tests/data/slapd-translucent-remote.conf @@ -40,9 +40,7 @@ rootdn "o=translucent" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-unique.conf b/tests/data/slapd-unique.conf index ebcf36f1b7..43c0e360b7 100644 --- a/tests/data/slapd-unique.conf +++ b/tests/data/slapd-unique.conf @@ -39,10 +39,8 @@ suffix "o=unique" rootdn "cn=Manager,o=unique" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-valregex.conf b/tests/data/slapd-valregex.conf index 3c55ff84d9..84152bd5f9 100644 --- a/tests/data/slapd-valregex.conf +++ b/tests/data/slapd-valregex.conf @@ -47,10 +47,8 @@ rootdn "cn=Manager,dc=example,dc=com" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-valsort.conf b/tests/data/slapd-valsort.conf index b9a447762f..229d5c7f28 100644 --- a/tests/data/slapd-valsort.conf +++ b/tests/data/slapd-valsort.conf @@ -37,10 +37,8 @@ suffix "o=valsort" rootdn "cn=Manager,o=valsort" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd-whoami.conf b/tests/data/slapd-whoami.conf index c9bbea570c..2deeb58d0d 100644 --- a/tests/data/slapd-whoami.conf +++ b/tests/data/slapd-whoami.conf @@ -56,10 +56,8 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf index 05592cd006..84cf7ea979 100644 --- a/tests/data/slapd.conf +++ b/tests/data/slapd.conf @@ -42,11 +42,9 @@ rootdn "cn=Manager,dc=example,dc=com" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.1.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #bdb#checkpoint 1024 5 -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub #hdb#checkpoint 1024 5 #ndb#dbname db_1 #ndb#include @DATADIR@/ndb.conf diff --git a/tests/data/slapd2.conf b/tests/data/slapd2.conf index 32b50ae8db..fee52d5e8e 100644 --- a/tests/data/slapd2.conf +++ b/tests/data/slapd2.conf @@ -36,10 +36,8 @@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.2.a -#bdb#index objectClass eq -#bdb#index cn,sn,uid pres,eq,sub -#hdb#index objectClass eq -#hdb#index cn,sn,uid pres,eq,sub +#indexdb#index objectClass eq +#indexdb#index cn,sn,uid pres,eq,sub #ndb#dbname db_2 #ndb#include @DATADIR@/ndb.conf From 8d78d1e8a0860652b59c6a2f08e1bf524ab51be9 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Sun, 28 Aug 2011 13:00:57 +0200 Subject: [PATCH 3/3] Fixup maindb/indexdb --- tests/run.in | 4 ++-- tests/scripts/test025-limits | 2 +- tests/scripts/test056-monitor | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/run.in b/tests/run.in index 8e6bbfb00a..ebaae6173f 100644 --- a/tests/run.in +++ b/tests/run.in @@ -169,8 +169,8 @@ if test "x$BACKENDTYPE" = "x" ; then BACKENDTYPE="unknown" fi -# DB types with indexing, and the main DB types with some other stuff: -# currently mode, limits, paged results. +# Backend features. indexdb: indexing and unchecked limit. +# maindb: main storage backend. Currently index,limits,mode,paged results. INDEXDB=noindexdb MAINDB=nomaindb case $BACKEND in bdb|hdb|mdb) INDEXDB=indexdb MAINDB=maindb ;; diff --git a/tests/scripts/test025-limits b/tests/scripts/test025-limits index 04bddd1456..9d1ec12680 100755 --- a/tests/scripts/test025-limits +++ b/tests/scripts/test025-limits @@ -501,7 +501,7 @@ case $RC in ;; esac -if test $MAINDB = maindb ; then +if test $INDEXDB = indexdb ; then echo "Testing higher than unchecked limit requested for unchecked limited ID..." $LDAPRSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 -w secret \ diff --git a/tests/scripts/test056-monitor b/tests/scripts/test056-monitor index 4220177ca8..d8cfdb9946 100755 --- a/tests/scripts/test056-monitor +++ b/tests/scripts/test056-monitor @@ -100,10 +100,14 @@ echo "Filtering ldapsearch results..." $LDIFFILTER -b monitor < $SEARCHOUT > $SEARCHFLT TMPMONITOROUT2=$MONITOROUT2 -if test $MAINDB != maindb ; then +case $BACKEND in +bdb|hdb) + ;; +*) TMPMONITOROUT2=$TESTDIR/monitor2.out grep -v "olmBDB" $MONITOROUT2 > $TMPMONITOROUT2 -fi + ;; +esac echo "Comparing filter output..." $CMP $SEARCHFLT $TMPMONITOROUT2 > $CMPOUT