Rewrite master/slave ports

diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf
index f9335b767bcdd5ebed8e14d53c319874f8eeb70b..484b2e1b2236f44df3a00426fa9aa0e8ce41ab9f 100644 (file)
--- a/tests/data/slapd-ref-slave.conf
+++ b/tests/data/slapd-ref-slave.conf
@@ -15,7 +15,7 @@ argsfile    ./test-repl/slapd.args
 # ldbm database definitions
 #######################################################################
 
-referral       "ldap://localhost:9009/"
+referral       "ldap://localhost:@PORT@/"
 
 database       @BACKEND@
 cachesize      0

diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf
index 48c1c1b9b30486c4bd428186112af76e828e65f1..55e5f43118606b6f8e6358d236422cff5d485479 100644 (file)
--- a/tests/data/slapd-repl-master.conf
+++ b/tests/data/slapd-repl-master.conf
@@ -28,7 +28,7 @@ rootpw                secret
 
 replogfile     ./test-db/slapd.replog
 
-replica                host=localhost:9010
+replica                host=localhost:@SLAVEPORT@
                binddn="cn=Replica,o=University of Michigan,c=US"
                bindmethod=simple
                credentials=secret

diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf
index 28ab1289712d2e0270026fd6ebfbea780a293780..18be3844831e6cbe27cd0b56c5d6439332878e7b 100644 (file)
--- a/tests/data/slapd-repl-slave.conf
+++ b/tests/data/slapd-repl-slave.conf
@@ -11,7 +11,7 @@ include ./schema/openldap.schema
 pidfile     ./test-repl/slapd.pid
 argsfile    ./test-repl/slapd.args
 
-#referral      "ldap://localhost:9009/"
+#referral      "ldap://localhost:@PORT@/"
 
 #######################################################################
 # ldbm database definitions
@@ -24,7 +24,7 @@ directory     ./test-repl
 rootdn         "cn=Replica,o=University of Michigan,c=US"
 rootpw         secret
 updatedn       "cn=Replica,o=University of Michigan,c=US"
-updateref      "ldap://localhost:9009"
+updateref      "ldap://localhost:@PORT@"
 #ldbm#index            objectClass     eq
 #ldbm#index            cn,sn,uid       pres,eq,sub
 #bdb#index             objectClass     eq

diff --git a/tests/data/slapd-repl-submaster.conf b/tests/data/slapd-repl-submaster.conf
index 699dedbcc9a0ca4003aa1088660eea9d6a153312..2521cf851d69e4118761e1fa0b12ddbe69ddff5f 100644 (file)
--- a/tests/data/slapd-repl-submaster.conf
+++ b/tests/data/slapd-repl-submaster.conf
@@ -28,7 +28,7 @@ rootpw                secret
 
 replogfile     ./test-db/slapd.replog
 
-replica                host=localhost:9010
+replica                host=localhost:@SLAVEPORT@
                suffix="ou=Groups,o=University of Michigan,c=US"
                binddn="cn=Replica,ou=Groups,o=University of Michigan,c=US"
                bindmethod=simple

diff --git a/tests/data/slapd-repl-subslave.conf b/tests/data/slapd-repl-subslave.conf
index 79b2f80dbab105562cdc1b3b149102da36ee0cb4..6552af67e5a375396e6dc81561e4442f1e53a1e9 100644 (file)
--- a/tests/data/slapd-repl-subslave.conf
+++ b/tests/data/slapd-repl-subslave.conf
@@ -11,7 +11,7 @@ include ./schema/openldap.schema
 pidfile     ./test-repl/slapd.pid
 argsfile    ./test-repl/slapd.args
 
-#referral      "ldap://localhost:9009/"
+#referral      "ldap://localhost:@PORT@/"
 
 #######################################################################
 # ldbm database definitions
@@ -24,7 +24,7 @@ directory     ./test-repl
 rootdn         "cn=Replica,ou=Groups,o=University of Michigan,c=US"
 rootpw         secret
 updatedn       "cn=Replica,ou=Groups,o=University of Michigan,c=US"
-updateref      "ldap://localhost:9009"
+updateref      "ldap://localhost:@PORT@"
 #ldbm#index            objectClass     eq
 #ldbm#index            cn,sn,uid       pres,eq,sub
 #bdb#index             objectClass     eq

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index 703b199f4b0addf63672b0e9ff76a1dfe10f2cb6..b919732e36179949181b661c10fc75e728cd4389 100755 (executable)
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -1,8 +1,10 @@
 #! /bin/sh
 # $OpenLDAP$
+# . $SRCDIR/scripts/defines.sh
 if [ x"$MONITORDB" = x"yes" ] ; then
        MON=monitor
 else
        MON=nomonitor
 fi
-sed -e "s/@BACKEND@/$BACKEND/" -e "s/^#$BACKEND#//"  -e "s/^#$MON#//"
+sed -e "s/@BACKEND@/$BACKEND/" -e "s/^#$BACKEND#//"  -e "s/^#$MON#//" \
+       -e "s/@PORT@/$PORT/" -e "s/@SLAVEPORT@/$SLAVEPORT/"