Fix startup, use explicit serverIDs from the beginning

[openldap] / tests / scripts / conf.sh

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index 5ba3b9d9126f1b93663752ce811db1d5fb429cbe..e4a73a3b41f4c6716bdeb6a35e6fcbe5ff596cb8 100755 (executable)
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2007 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -12,12 +12,11 @@
 ## A copy of this license is available in the file LICENSE in the
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
+MONMOD=nomod
 if [ x"$MONITORDB" = xyes -o x"$MONITORDB" = xmod ] ; then
        MON=monitor
        if [ $MONITORDB = mod ] ; then
                MONMOD=monitormod
-       else
-               MONMOD=nomod
        fi
 else
        MON=nomonitor
@@ -27,7 +26,7 @@ if [ x"$WITH_SASL" = x"yes" -a x"$USE_SASL" != x"no" ] ; then
        if [ x"$USE_SASL" = x"yes" ] ; then
                USE_SASL=DIGEST-MD5
        fi
-       SASL_MECH="\"mech=$USE_SASL\""
+       SASL_MECH="\"saslmech=$USE_SASL\""
 else
        SASL="nosasl"
        SASL_MECH=
@@ -35,36 +34,44 @@ fi
 sed -e "s/@BACKEND@/${BACKEND}/"                       \
        -e "s/^#${BACKEND}#//"                          \
        -e "s/@RELAY@/${RELAY}/"                        \
-       -e "s/^#relay-${RELAY}#//"                              \
+       -e "s/^#relay-${RELAY}#//"                      \
        -e "s/^#${BACKENDTYPE}#//"                      \
-       -e "s/^#${AC_glue}#//"                          \
        -e "s/^#${AC_ldap}#//"                          \
        -e "s/^#${AC_meta}#//"                          \
        -e "s/^#${AC_relay}#//"                         \
        -e "s/^#${AC_sql}#//"                           \
                -e "s/^#${RDBMS}#//"                    \
+       -e "s/^#${AC_accesslog}#//"                     \
+       -e "s/^#${AC_dds}#//"                           \
+       -e "s/^#${AC_dynlist}#//"                       \
        -e "s/^#${AC_pcache}#//"                        \
        -e "s/^#${AC_ppolicy}#//"                       \
        -e "s/^#${AC_refint}#//"                        \
+       -e "s/^#${AC_retcode}#//"                       \
+       -e "s/^#${AC_rwm}#//"                           \
        -e "s/^#${AC_syncprov}#//"                      \
-       -e "s/^#${AC_translucent}#//"           \
+       -e "s/^#${AC_translucent}#//"                   \
        -e "s/^#${AC_unique}#//"                        \
-       -e "s/^#${AC_rwm}#//"                   \
+       -e "s/^#${AC_valsort}#//"                       \
        -e "s/^#${MON}#//"                              \
        -e "s/^#${MONMOD}#//"                           \
        -e "s/^#${SASL}#//"                             \
-       -e "s;@URI1@;${URI1};"  \
-       -e "s;@URI2@;${URI2};"  \
-       -e "s;@URI3@;${URI3};"  \
-       -e "s;@URI4@;${URI4};"  \
-       -e "s;@URI5@;${URI5};"  \
-       -e "s;@URI6@;${URI6};"  \
-       -e "s;@PORT1@;${PORT1};"        \
-       -e "s;@PORT2@;${PORT2};"        \
-       -e "s;@PORT3@;${PORT3};"        \
-       -e "s;@PORT4@;${PORT4};"        \
-       -e "s;@PORT5@;${PORT5};"        \
-       -e "s;@PORT6@;${PORT6};"        \
-       -e "s/@SASL_MECH@/${SASL_MECH}/"        \
+       -e "s/^#${ACI}#//"                              \
+       -e "s;@URI1@;${URI1};"                          \
+       -e "s;@URI2@;${URI2};"                          \
+       -e "s;@URI3@;${URI3};"                          \
+       -e "s;@URI4@;${URI4};"                          \
+       -e "s;@URI5@;${URI5};"                          \
+       -e "s;@URI6@;${URI6};"                          \
+       -e "s;@PORT1@;${PORT1};"                        \
+       -e "s;@PORT2@;${PORT2};"                        \
+       -e "s;@PORT3@;${PORT3};"                        \
+       -e "s;@PORT4@;${PORT4};"                        \
+       -e "s;@PORT5@;${PORT5};"                        \
+       -e "s;@PORT6@;${PORT6};"                        \
+       -e "s/@SASL_MECH@/${SASL_MECH}/"                \
        -e "s/@CACHETTL@/${CACHETTL}/"                  \
-       -e "s/@ENTRY_LIMIT@/${CACHE_ENTRY_LIMIT}/"
+       -e "s/@ENTRY_LIMIT@/${CACHE_ENTRY_LIMIT}/"      \
+       -e "s;@TESTDIR@;${TESTDIR};"                    \
+       -e "s;@DATADIR@;${DATADIR};"                    \
+       -e "s;@SCHEMADIR@;${SCHEMADIR};"