X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Fconf.sh;h=ddce73cdb734638ea6f18aca0f3a36625fda9a17;hb=c859cdab519ea82a6f51d9ede6496ab3d3e47b77;hp=06cbe3120594bb894b4d40906c1a73b4226622ed;hpb=2e53c5ab6b8e090ce32c22daef970b0d3b66d9d7;p=openldap
diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index 06cbe31205..ddce73cdb7 100755
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -2,7 +2,7 @@
# $OpenLDAP$
## This work is part of OpenLDAP Software .
##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2006 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
## .
+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
@@ -35,36 +34,43 @@ 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_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};"