Fix typo ($backend -> $BACKEND)

[openldap] / tests / scripts / conf.sh

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index fe236bd5747d985a56eadbea2d3eb85abd6e4cf2..11530114a17603cee4804690ca18cd5014936db6 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-2008 The OpenLDAP Foundation.
+## Copyright 1998-2010 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -33,6 +33,8 @@ else
 fi
 sed -e "s/@BACKEND@/${BACKEND}/"                       \
        -e "s/^#${BACKEND}#//"                          \
+       -e "/^#~/s/^#[^#]*~${BACKEND}~[^#]*#/#omit: /"  \
+               -e "s/^#~[^#]*~#//"                     \
        -e "s/@RELAY@/${RELAY}/"                        \
        -e "s/^#relay-${RELAY}#//"                      \
        -e "s/^#${BACKENDTYPE}#//"                      \
@@ -71,10 +73,6 @@ sed -e "s/@BACKEND@/${BACKEND}/"                     \
        -e "s;@PORT5@;${PORT5};"                        \
        -e "s;@PORT6@;${PORT6};"                        \
        -e "s/@SASL_MECH@/${SASL_MECH}/"                \
-       -e "s/@CACHETTL@/${CACHETTL}/"                  \
-       -e "s/@NCACHETTL@/${NCACHETTL}/"                \
-       -e "s/@SCACHETTL@/${SCACHETTL}/"                \
-       -e "s/@ENTRY_LIMIT@/${CACHE_ENTRY_LIMIT}/"      \
        -e "s;@TESTDIR@;${TESTDIR};"                    \
        -e "s;@DATADIR@;${DATADIR};"                    \
        -e "s;@SCHEMADIR@;${SCHEMADIR};"