From: Hallvard Furuseth <hallvard@openldap.org>
Date: Fri, 9 Mar 2012 21:17:33 +0000 (+0100)
Subject: ITS#7204 Fix test044-dynlist for --disable-monitor
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=af3a23a1ec93220be392a8ea6372475b7357c171;p=openldap

ITS#7204 Fix test044-dynlist for --disable-monitor

test044-dynlist uses olcDatabase={2}$BACKEND,cn=config.
This breaks when back-monitor is omitted as database {1}.
---

diff --git a/tests/scripts/test044-dynlist b/tests/scripts/test044-dynlist
index 2edd74e391..4b2b9f4e24 100755
--- a/tests/scripts/test044-dynlist
+++ b/tests/scripts/test044-dynlist
@@ -31,6 +31,12 @@ mkdir -p $TESTDIR $DBDIR1
 $SLAPPASSWD -g -n >$CONFIGPWF
 echo "rootpw `$SLAPPASSWD -T $CONFIGPWF`" >$TESTDIR/configpw.conf
 
+if test $MONITORDB != no ; then
+	DBIX=2
+else
+	DBIX=1
+fi
+
 echo "Running slapadd to build slapd database..."
 . $CONFFILTER $BACKEND $MONITORDB < $MCONF > $ADDCONF
 $SLAPADD -f $ADDCONF -l $LDIFORDERED
@@ -254,7 +260,7 @@ echo "Reconfiguring slapd..."
 $LDAPMODIFY -x -D cn=config -h $LOCALHOST -p $PORT1 -y $CONFIGPWF > \
 	$TESTOUT 2>&1 << EOMODS
 version: 1
-dn: olcOverlay={0}dynlist,olcDatabase={2}$BACKEND,cn=config
+dn: olcOverlay={0}dynlist,olcDatabase={$DBIX}$BACKEND,cn=config
 changetype: modify
 delete: olcDLattrSet
 olcDLattrSet: {0}
@@ -364,7 +370,7 @@ echo "Reconfiguring slapd..."
 $LDAPMODIFY -x -D cn=config -h $LOCALHOST -p $PORT1 -y $CONFIGPWF > \
 	$TESTOUT 2>&1 << EOMODS
 version: 1
-dn: olcOverlay={0}dynlist,olcDatabase={2}$BACKEND,cn=config
+dn: olcOverlay={0}dynlist,olcDatabase={$DBIX}$BACKEND,cn=config
 changetype: modify
 delete: olcDLattrSet
 olcDLattrSet: {0}
@@ -526,7 +532,7 @@ echo "Testing dgIdentity..."
 $LDAPMODIFY -x -D cn=config -h $LOCALHOST -p $PORT1 -y $CONFIGPWF > \
 	$TESTOUT 2>&1 << EOMODS
 version: 1
-dn: olcDatabase={2}$BACKEND,cn=config
+dn: olcDatabase={$DBIX}$BACKEND,cn=config
 changetype: modify
 add: olcAccess
 olcAccess: to dn.base="cn=Dynamic List of Members,$LISTDN" by * read