ITS#3671 must release conn->c_mutex to allow blocked writers to exit

[openldap] / tests / scripts / conf.sh

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index 99147ad9bb611b2515087272668f1b98498a54de..4e471a6da7067e35122cd4f3912c9cfc10343261 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-2004 The OpenLDAP Foundation.
+## Copyright 1998-2005 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
 ## 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>.
-if [ x"$MONITORDB" = x"yes" -o x"$MONITORDB" = xmod ] ; then
+if [ x"$MONITORDB" = xyes -o x"$MONITORDB" = xmod ] ; then
        MON=monitor
        if [ $MONITORDB = mod ] ; then
                MONMOD=monitormod
@@ -22,21 +22,49 @@ if [ x"$MONITORDB" = x"yes" -o x"$MONITORDB" = xmod ] ; then
 else
        MON=nomonitor
 fi
-if [ x"$WITH_SASL" = x"yes" -a x"$USE_SASL" = x"yes" ] ; then
+if [ x"$WITH_SASL" = x"yes" -a x"$USE_SASL" != x"no" ] ; then
        SASL="sasl"
+       if [ x"$USE_SASL" = x"yes" ] ; then
+               USE_SASL=DIGEST-MD5
+       fi
+       SASL_MECH="\"mech=$USE_SASL\""
 else
        SASL="nosasl"
+       SASL_MECH=
 fi
 sed -e "s/@BACKEND@/${BACKEND}/"                       \
        -e "s/^#${BACKEND}#//"                          \
+       -e "s/@RELAY@/${RELAY}/"                        \
+       -e "s/^#${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_pcache}#//"                        \
        -e "s/^#${AC_ppolicy}#//"                       \
        -e "s/^#${AC_refint}#//"                        \
+       -e "s/^#${AC_syncprov}#//"                      \
+       -e "s/^#${AC_translucent}#//"           \
        -e "s/^#${AC_unique}#//"                        \
+       -e "s/^#${AC_rwm}#//"                   \
        -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/@CACHETTL@/${CACHETTL}/"                  \
        -e "s/@ENTRY_LIMIT@/${CACHE_ENTRY_LIMIT}/"