From b92f653d60a2378ce5f3a303df9b04ca44087413 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Fri, 30 Jan 2009 20:02:54 +0000 Subject: [PATCH] ITS#5910 --- CHANGES | 2 ++ tests/scripts/test006-acls | 2 +- tests/scripts/test048-syncrepl-multiproxy | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index c37ba2860d..4bb30cc618 100644 --- a/CHANGES +++ b/CHANGES @@ -48,6 +48,8 @@ OpenLDAP 2.4.14 Engineering Added contrib/smbk5pwd gcrypt support (ITS#5410) Added contrib/passwd sha2 support (ITS#5660) Build Environment + Fixed test006 appending to log file (ITS#5910) + Fixed test048 sed pathname substitution (ITS#5910) Fixed test049,test050 to work on windows (ITS#5842) Updated test017,test018,test019 to cover more cases (ITS#5883) Removed patch for BerkeleyDB 4.7.25 (Official patch available) diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls index b068a7617b..a06fe9f007 100755 --- a/tests/scripts/test006-acls +++ b/tests/scripts/test006-acls @@ -284,7 +284,7 @@ esac # fail when we add some DN other than our own, and should succeed when # we add our own DN. # bjensen -$LDAPMODIFY -D "$JAJDN" -h $LOCALHOST -p $PORT1 -w jaj > \ +$LDAPMODIFY -D "$JAJDN" -h $LOCALHOST -p $PORT1 -w jaj >> \ $TESTOUT 2>&1 << EOMODS1 version: 1 dn: cn=ITD Staff, ou=Groups, dc=example, dc=com diff --git a/tests/scripts/test048-syncrepl-multiproxy b/tests/scripts/test048-syncrepl-multiproxy index 3e15a7b991..eb9a444dad 100755 --- a/tests/scripts/test048-syncrepl-multiproxy +++ b/tests/scripts/test048-syncrepl-multiproxy @@ -119,7 +119,7 @@ if test $RC != 0 ; then fi echo "Starting R1 slave slapd on TCP/IP port $PORT3..." -. $CONFFILTER $BACKEND $MONITORDB < $RSLAVECONF | sed -e 's;\.2\.;.3.;' > $CONF3 +. $CONFFILTER $BACKEND $MONITORDB < $RSLAVECONF | sed -e 's;\.2\.\([^/]*\)$;.3.\1;' > $CONF3 $SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 & R1SLAVEPID=$! if test $WAIT != 0 ; then -- 2.39.5