ITS#2740, #2859 fixes for dynamic backends

This commit is contained in:
Howard Chu 2003-12-04 11:15:07 +00:00
parent 2d07fc4f3b
commit 37964b63e3
24 changed files with 52 additions and 51 deletions

View File

@ -26,8 +26,8 @@ argsfile ./testrun/slapd.1.args
access to dn.base="" attr=objectClass by users read
access to * by * read
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# ldbm database definitions

View File

@ -23,8 +23,8 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# database definitions

View File

@ -21,8 +21,8 @@ argsfile ./test-db/slapd.args
sasl-secprops noanonymous
#sasl-secprops none
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# ldbm database definitions

View File

@ -22,8 +22,8 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# ldbm database definitions

View File

@ -25,8 +25,8 @@ include ./testdata/ditcontentrules.conf
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# ldbm database definitions

View File

@ -23,8 +23,8 @@ include ./schema/internet_mail.oc.conf
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# ldbm database definitions

View File

@ -22,8 +22,8 @@ include ./schema/nis.schema
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# ldbm database definitions

View File

@ -25,8 +25,10 @@ argsfile ./testrun/slapd.2.args
access to * by write
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#ldapmod#moduleload ../servers/slapd/back-ldap/back_ldap.la
#metamod#moduleload ../servers/slapd/back-meta/back_meta.la
#######################################################################
# database definitions

View File

@ -24,8 +24,8 @@ argsfile ./testrun/slapd.1.args
# password-hash {md5}
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# ldbm database definitions

View File

@ -23,8 +23,8 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.2.pid
argsfile ./testrun/slapd.2.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# ldbm database definitions

View File

@ -22,8 +22,8 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.pid
argsfile ./testrun/slapd.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# ldbm database definitions

View File

@ -23,8 +23,8 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# ldbm database definitions

View File

@ -23,8 +23,8 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.2.pid
argsfile ./testrun/slapd.2.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# ldbm database definitions

View File

@ -33,8 +33,8 @@ argsfile ./testrun/slapd.1.args
#
rootdse ./testdata/rootdse.ldif
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# ldbm database definitions

View File

@ -23,8 +23,8 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# master database definitions

View File

@ -23,8 +23,8 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.4.pid
argsfile ./testrun/slapd.4.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# consumer database definitions

View File

@ -11,8 +11,8 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.5.pid
argsfile ./testrun/slapd.5.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# consumer database definitions

View File

@ -23,8 +23,8 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.6.pid
argsfile ./testrun/slapd.6.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# consumer database definitions

View File

@ -23,8 +23,8 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.2.pid
argsfile ./testrun/slapd.2.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# consumer database definitions

View File

@ -23,8 +23,8 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.3.pid
argsfile ./testrun/slapd.3.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# consumer database definitions

View File

@ -24,9 +24,8 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.1.pid
argsfile ./testrun/slapd.1.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# database definitions

View File

@ -23,9 +23,8 @@ include ./schema/nis.schema
pidfile ./testrun/slapd.2.pid
argsfile ./testrun/slapd.2.args
modulepath ../servers/slapd/back-@BACKEND@/
@MODULELOAD@
#mod#modulepath ../servers/slapd/back-@BACKEND@/
#mod#moduleload back_@BACKEND@.la
#######################################################################
# database definitions

View File

@ -25,11 +25,13 @@ export SRCDIR TOPSRCDIR LN_S
AC_bdb=@BUILD_BDB@
AC_hdb=@BUILD_HDB@
AC_ldbm=@BUILD_LDBM@
AC_ldap=ldap@BUILD_LDAP@
AC_meta=meta@BUILD_META@
AC_MONITOR=@BUILD_MONITOR@
AC_CACHE=@BUILD_CACHE@
AC_WITH_TLS=@WITH_TLS@
export AC_MONITOR AC_CACHE AC_WITH_TLS
export AC_MONITOR AC_CACHE AC_WITH_TLS AC_ldap AC_meta
if test ! -x ../servers/slapd/slapd ; then
echo "Could not locate slapd(8)"

View File

@ -17,12 +17,11 @@ if [ x"$MONITORDB" = x"yes" ] ; then
else
MON=nomonitor
fi
if [ x"$BACKENDTYPE" = x"mod" ]; then
MODULELOAD="moduleload back_${BACKEND}.la"
fi
sed -e "s/@BACKEND@/${BACKEND}/" \
-e "s/@MODULELOAD@/${MODULELOAD}/" \
-e "s/^#${BACKEND}#//" \
-e "s/^#${BACKENDTYPE}#//" \
-e "s/^#${AC_ldap}#//" \
-e "s/^#${AC_meta}#//" \
-e "s/^#${MON}#//" \
-e "s/@CACHETTL@/${CACHETTL}/" \
-e "s/@ENTRY_LIMIT@/${CACHE_ENTRY_LIMIT}/"