ITS#5910

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)

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

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