ITS#6213

diff --git a/CHANGES b/CHANGES
index d4f185d80d22362b7fbb3390f98238a2ce9d88c1..f2e22f9712930dfc01aff7e30543430225ea8700 100644 (file)
--- 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 8b394dfe9255a1484990a358706426dcc58f5df0..06beecc8911a140cd8a3e8e5d48cb4b6c450fd7c 100644 (file)
--- 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 36b5cc54cbb684c42561441db4c343a2efcace06..109edfd3c708a3ce155ab80c9cc4f78ee000eda8 100755 (executable)
--- 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