From 4bc4134185639e233b6cc22c427be70dbd0edba3 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Wed, 22 Jul 2009 21:49:53 +0000 Subject: [PATCH] ITS#6213 --- CHANGES | 2 ++ tests/data/monitor1.out | 4 ++-- tests/scripts/test056-monitor | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index d4f185d80d..f2e22f9712 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,8 @@ OpenLDAP 2.4 Change Log OpenLDAP 2.4.18 Engineering Fixed slapd incorrectly applying writetimeout when not set (ITS#6220) Fixed slapd-ndb startup (ITS#6203) + Build Environment + Fixed test056-monitor with custom ports (ITS#6213) OpenLDAP 2.4.17 Release (2009/07/13) Fixed liblber to use ber_strnlen (ITS#6080) diff --git a/tests/data/monitor1.out b/tests/data/monitor1.out index 8b394dfe92..06beecc891 100644 --- a/tests/data/monitor1.out +++ b/tests/data/monitor1.out @@ -9,8 +9,8 @@ monitorConnectionGet: 2 monitorConnectionRead: 2 monitorConnectionWrite: 0 monitorConnectionMask: rx -monitorConnectionListener: ldap://localhost:9011/ -monitorConnectionLocalAddress: IP=127.0.0.1:9011 +monitorConnectionListener: ldap://localhost:@PORT1@/ +monitorConnectionLocalAddress: IP=127.0.0.1:@PORT1@ entryDN: cn=Connection 1,cn=Connections,cn=Monitor dn: cn=Connections,cn=Monitor diff --git a/tests/scripts/test056-monitor b/tests/scripts/test056-monitor index 36b5cc54cb..109edfd3c7 100755 --- a/tests/scripts/test056-monitor +++ b/tests/scripts/test056-monitor @@ -66,7 +66,7 @@ localrewrite='s/=127\.0\.0\.1:/=LOCAL:/; s/=\[::1\]:/=LOCAL:/' echo "Filtering ldapsearch results..." sed -e "$localrewrite" < $SEARCHOUT | . $LDIFFILTER > $SEARCHFLT echo "Filtering expected data..." -sed -e "$localrewrite" < $MONITOROUT1 | . $LDIFFILTER > $LDIFFLT +. $CONFFILTER < $MONITOROUT1 | sed -e "$localrewrite" | . $LDIFFILTER > $LDIFFLT echo "Comparing filter output..." $CMP $SEARCHFLT $LDIFFLT > $CMPOUT -- 2.39.5