X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Fconf.sh;h=58ce5214f4cdc50765ef1bca53d31e997b0d9f40;hb=737562a20b3d8df1ecffec610f285f583b75f5c9;hp=9c51238e29b7c352d61f6ed17bf7b348a0793f4a;hpb=6680465d020db8058d053fc5615922d7bec251a2;p=openldap

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index 9c51238e29..58ce5214f4 100755
--- 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-2003 The OpenLDAP Foundation.
+## Copyright 1998-2005 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -12,17 +12,60 @@
 ## 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" ] ; then
+MONMOD=nomod
+if [ x"$MONITORDB" = xyes -o x"$MONITORDB" = xmod ] ; then
 	MON=monitor
+	if [ $MONITORDB = mod ] ; then
+		MONMOD=monitormod
+	fi
 else
 	MON=nomonitor
 fi
-if [ x"$BACKENDTYPE" = x"mod" ]; then
-	MODULELOAD="moduleload	back_${BACKEND}.la"
+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="\"saslmech=$USE_SASL\""
+else
+	SASL="nosasl"
+	SASL_MECH=
 fi
-sed -e "s/@BACKEND@/${BACKEND}/"	\
-	-e "s/@MODULELOAD@/${MODULELOAD}/" \
-	-e "s/^#${BACKEND}#//"			\
+sed -e "s/@BACKEND@/${BACKEND}/"			\
+	-e "s/^#${BACKEND}#//"				\
+	-e "s/@RELAY@/${RELAY}/"			\
+	-e "s/^#relay-${RELAY}#//"			\
+	-e "s/^#${BACKENDTYPE}#//"			\
+	-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_retcode}#//"			\
+	-e "s/^#${AC_rwm}#//"				\
+	-e "s/^#${AC_syncprov}#//"			\
+	-e "s/^#${AC_translucent}#//"			\
+	-e "s/^#${AC_unique}#//"			\
+	-e "s/^#${AC_valsort}#//"			\
 	-e "s/^#${MON}#//"				\
-	-e "s/@CACHETTL@/${CACHETTL}/"   \
-	-e "s/@ENTRY_LIMIT@/${CACHE_ENTRY_LIMIT}/"   
+	-e "s/^#${MONMOD}#//"				\
+	-e "s/^#${SASL}#//"				\
+	-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}/"